From: Sasha Levin <sashal@kernel.org> To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aaro Koskinen <aaro.koskinen@iki.fi>, Felipe Balbi <felipe.balbi@linux.intel.com>, Sasha Levin <sashal@kernel.org>, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 22/45] USB: omap_udc: use devm_request_irq() Date: Wed, 5 Dec 2018 04:46:43 -0500 [thread overview] Message-ID: <20181205094706.7225-22-sashal@kernel.org> (raw) In-Reply-To: <20181205094706.7225-1-sashal@kernel.org> From: Aaro Koskinen <aaro.koskinen@iki.fi> [ Upstream commit 286afdde1640d8ea8916a0f05e811441fbbf4b9d ] The current code fails to release the third irq on the error path (observed by reading the code), and we get also multiple WARNs with failing gadget drivers due to duplicate IRQ releases. Fix by using devm_request_irq(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/usb/gadget/udc/omap_udc.c | 37 +++++++++---------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c index a8709f9e5648..2945408f0eec 100644 --- a/drivers/usb/gadget/udc/omap_udc.c +++ b/drivers/usb/gadget/udc/omap_udc.c @@ -2886,8 +2886,8 @@ static int omap_udc_probe(struct platform_device *pdev) udc->clr_halt = UDC_RESET_EP; /* USB general purpose IRQ: ep0, state changes, dma, etc */ - status = request_irq(pdev->resource[1].start, omap_udc_irq, - 0, driver_name, udc); + status = devm_request_irq(&pdev->dev, pdev->resource[1].start, + omap_udc_irq, 0, driver_name, udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[1].start, status); @@ -2895,20 +2895,20 @@ static int omap_udc_probe(struct platform_device *pdev) } /* USB "non-iso" IRQ (PIO for all but ep0) */ - status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, - 0, "omap_udc pio", udc); + status = devm_request_irq(&pdev->dev, pdev->resource[2].start, + omap_udc_pio_irq, 0, "omap_udc pio", udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[2].start, status); - goto cleanup2; + goto cleanup1; } #ifdef USE_ISO - status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, - 0, "omap_udc iso", udc); + status = devm_request_irq(&pdev->dev, pdev->resource[3].start, + omap_udc_iso_irq, 0, "omap_udc iso", udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[3].start, status); - goto cleanup3; + goto cleanup1; } #endif if (cpu_is_omap16xx() || cpu_is_omap7xx()) { @@ -2921,22 +2921,11 @@ static int omap_udc_probe(struct platform_device *pdev) create_proc_file(); status = usb_add_gadget_udc_release(&pdev->dev, &udc->gadget, omap_udc_release); - if (status) - goto cleanup4; - - return 0; + if (!status) + return 0; -cleanup4: remove_proc_file(); -#ifdef USE_ISO -cleanup3: - free_irq(pdev->resource[2].start, udc); -#endif - -cleanup2: - free_irq(pdev->resource[1].start, udc); - cleanup1: kfree(udc); udc = NULL; @@ -2980,12 +2969,6 @@ static int omap_udc_remove(struct platform_device *pdev) remove_proc_file(); -#ifdef USE_ISO - free_irq(pdev->resource[3].start, udc); -#endif - free_irq(pdev->resource[2].start, udc); - free_irq(pdev->resource[1].start, udc); - if (udc->dc_clk) { if (udc->clk_requested) omap_udc_enable_clock(0); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aaro Koskinen <aaro.koskinen@iki.fi>, Felipe Balbi <felipe.balbi@linux.intel.com>, Sasha Levin <sashal@kernel.org>, linux-usb@vger.kernel.org Subject: [AUTOSEL,4.9,22/45] USB: omap_udc: use devm_request_irq() Date: Wed, 5 Dec 2018 04:46:43 -0500 [thread overview] Message-ID: <20181205094706.7225-22-sashal@kernel.org> (raw) From: Aaro Koskinen <aaro.koskinen@iki.fi> [ Upstream commit 286afdde1640d8ea8916a0f05e811441fbbf4b9d ] The current code fails to release the third irq on the error path (observed by reading the code), and we get also multiple WARNs with failing gadget drivers due to duplicate IRQ releases. Fix by using devm_request_irq(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/usb/gadget/udc/omap_udc.c | 37 +++++++++---------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c index a8709f9e5648..2945408f0eec 100644 --- a/drivers/usb/gadget/udc/omap_udc.c +++ b/drivers/usb/gadget/udc/omap_udc.c @@ -2886,8 +2886,8 @@ static int omap_udc_probe(struct platform_device *pdev) udc->clr_halt = UDC_RESET_EP; /* USB general purpose IRQ: ep0, state changes, dma, etc */ - status = request_irq(pdev->resource[1].start, omap_udc_irq, - 0, driver_name, udc); + status = devm_request_irq(&pdev->dev, pdev->resource[1].start, + omap_udc_irq, 0, driver_name, udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[1].start, status); @@ -2895,20 +2895,20 @@ static int omap_udc_probe(struct platform_device *pdev) } /* USB "non-iso" IRQ (PIO for all but ep0) */ - status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, - 0, "omap_udc pio", udc); + status = devm_request_irq(&pdev->dev, pdev->resource[2].start, + omap_udc_pio_irq, 0, "omap_udc pio", udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[2].start, status); - goto cleanup2; + goto cleanup1; } #ifdef USE_ISO - status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, - 0, "omap_udc iso", udc); + status = devm_request_irq(&pdev->dev, pdev->resource[3].start, + omap_udc_iso_irq, 0, "omap_udc iso", udc); if (status != 0) { ERR("can't get irq %d, err %d\n", (int) pdev->resource[3].start, status); - goto cleanup3; + goto cleanup1; } #endif if (cpu_is_omap16xx() || cpu_is_omap7xx()) { @@ -2921,22 +2921,11 @@ static int omap_udc_probe(struct platform_device *pdev) create_proc_file(); status = usb_add_gadget_udc_release(&pdev->dev, &udc->gadget, omap_udc_release); - if (status) - goto cleanup4; - - return 0; + if (!status) + return 0; -cleanup4: remove_proc_file(); -#ifdef USE_ISO -cleanup3: - free_irq(pdev->resource[2].start, udc); -#endif - -cleanup2: - free_irq(pdev->resource[1].start, udc); - cleanup1: kfree(udc); udc = NULL; @@ -2980,12 +2969,6 @@ static int omap_udc_remove(struct platform_device *pdev) remove_proc_file(); -#ifdef USE_ISO - free_irq(pdev->resource[3].start, udc); -#endif - free_irq(pdev->resource[2].start, udc); - free_irq(pdev->resource[1].start, udc); - if (udc->dc_clk) { if (udc->clk_requested) omap_udc_enable_clock(0);
next prev parent reply other threads:[~2018-12-05 10:00 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-05 9:46 [PATCH AUTOSEL 4.9 01/45] ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 02/45] iio:st_magn: Fix enable device after trigger Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 03/45] ARM: dts: logicpd-somlv: Fix interrupt on mmc3_dat1 Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 04/45] ARM: OMAP1: ams-delta: Fix possible use of uninitialized field Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 05/45] sysv: return 'err' instead of 0 in __sysv_write_inode Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 06/45] selftests: add script to stress-test nft packet path vs. control plane Sasha Levin 2018-12-05 9:46 ` Sasha Levin 2018-12-05 9:46 ` sashal 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 07/45] s390/cpum_cf: Reject request for sampling in event initialization Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 08/45] hwmon: (ina2xx) Fix current value calculation Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 09/45] ASoC: omap-abe-twl6040: Fix missing audio card caused by deferred probing Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 10/45] ASoC: dapm: Recalculate audio map forcely when card instantiated Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 11/45] hwmon: (w83795) temp4_type has writable permission Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 12/45] objtool: Fix double-free in .cold detection error path Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 13/45] objtool: Fix segfault in .cold detection with -ffunction-sections Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 14/45] Btrfs: send, fix infinite loop due to directory rename dependencies Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 15/45] RDMA/mlx5: Fix fence type for IB_WR_LOCAL_INV WR Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 16/45] uprobes: Fix handle_swbp() vs. unregister() + register() race once more Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 17/45] ASoC: omap-mcpdm: Add pm_qos handling to avoid under/overruns with CPU_IDLE Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 18/45] ASoC: omap-dmic: Add pm_qos handling to avoid overruns " Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 19/45] exportfs: do not read dentry after free Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 20/45] bpf: fix check of allowed specifiers in bpf_trace_printk Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 21/45] ipvs: call ip_vs_dst_notifier earlier than ipv6_dev_notf Sasha Levin 2018-12-05 9:46 ` Sasha Levin [this message] 2018-12-05 9:46 ` [AUTOSEL,4.9,22/45] USB: omap_udc: use devm_request_irq() Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 23/45] USB: omap_udc: fix crashes on probe error and module removal Sasha Levin 2018-12-05 9:46 ` [AUTOSEL,4.9,23/45] " Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 24/45] USB: omap_udc: fix omap_udc_start() on 15xx machines Sasha Levin 2018-12-05 9:46 ` [AUTOSEL,4.9,24/45] " Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 25/45] USB: omap_udc: fix USB gadget functionality on Palm Tungsten E Sasha Levin 2018-12-05 9:46 ` [AUTOSEL,4.9,25/45] " Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 26/45] KVM: x86: fix empty-body warnings Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 27/45] x86/kvm/vmx: fix old-style function declaration Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 28/45] net: thunderx: fix NULL pointer dereference in nic_remove Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 29/45] cachefiles: Fix page leak in cachefiles_read_backing_file while vmscan is active Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 30/45] igb: fix uninitialized variables Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 31/45] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 32/45] rapidio/rionet: do not free skb before reading its length Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 33/45] net: hisilicon: remove unexpected free_netdev Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 34/45] s390/qeth: fix length check in SNMP processing Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 35/45] drm/ast: fixed reading monitor EDID not stable issue Sasha Levin 2018-12-05 9:46 ` Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 36/45] xen: xlate_mmu: add missing header to fix 'W=1' warning Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 37/45] fscache: fix race between enablement and dropping of object Sasha Levin 2018-12-05 9:46 ` [PATCH AUTOSEL 4.9 38/45] fscache, cachefiles: remove redundant variable 'cache' Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 39/45] test_hexdump: use memcpy instead of strncpy Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 40/45] unifdef: " Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 41/45] ocfs2: fix deadlock caused by ocfs2_defrag_extent() Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 42/45] hfs: do not free node before using Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 43/45] hfsplus: " Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 44/45] debugobjects: avoid recursive calls with kmemleak Sasha Levin 2018-12-05 9:47 ` [PATCH AUTOSEL 4.9 45/45] ocfs2: fix potential use after free Sasha Levin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181205094706.7225-22-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=aaro.koskinen@iki.fi \ --cc=felipe.balbi@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.