From: "Lothar Waßmann" <LW@KARO-electronics.de>
To: Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>,
George Cherian <george.cherian@ti.com>,
<linux-arm-kernel@lists.infradead.org>,
Roger Quadros <rogerq@ti.com>
Cc: "Lothar Waßmann" <LW@KARO-electronics.de>
Subject: [PATCH 4/9] usb: phy: am335x-control: prevent module from being unloaded when in use
Date: Fri, 18 Jul 2014 11:31:25 +0200 [thread overview]
Message-ID: <1405675890-8802-5-git-send-email-LW@KARO-electronics.de> (raw)
In-Reply-To: <1405675890-8802-4-git-send-email-LW@KARO-electronics.de>
This patch fixes the real cause of the crash that was "fixed" by
commit 7adb5c876e9c usb: musb: Fix panic upon musb_am335x module removal
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
drivers/usb/phy/phy-am335x-control.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 35b6083..df3e1ba 100644
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -140,6 +140,9 @@ static int am335x_control_usb_probe(struct platform_device *pdev)
const struct of_device_id *of_id;
const struct phy_control *phy_ctrl;
+ if (!try_module_get(pdev->dev.parent->driver->owner))
+ return -EPROBE_DEFER;
+
of_id = of_match_node(omap_control_usb_id_table, pdev->dev.of_node);
if (!of_id)
return -EINVAL;
@@ -171,8 +174,15 @@ static int am335x_control_usb_probe(struct platform_device *pdev)
return 0;
}
+static int am335x_control_usb_remove(struct platform_device *pdev)
+{
+ module_put(pdev->dev.parent->driver->owner);
+ return 0;
+}
+
static struct platform_driver am335x_control_driver = {
.probe = am335x_control_usb_probe,
+ .remove = am335x_control_usb_remove,
.driver = {
.name = "am335x-control-usb",
.owner = THIS_MODULE,
--
1.7.10.4
next prev parent reply other threads:[~2014-07-18 9:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 9:31 [PATCH 0/9] usb: musb: several bugfixes for the musb driver Lothar Waßmann
2014-07-18 9:31 ` [PATCH 1/9] usb: musb: core: cleanup - remove some useless 'break's from switch statements Lothar Waßmann
2014-07-18 9:31 ` [PATCH 2/9] usb: phy: am335x: group the #includes by subdirs Lothar Waßmann
2014-07-18 9:31 ` [PATCH 3/9] usb: musb_am335x: source cleanup Lothar Waßmann
2014-07-18 9:31 ` Lothar Waßmann [this message]
2014-07-18 9:31 ` [PATCH 5/9] usb: musb: print error message with dev_err() instead of dev_dbg() Lothar Waßmann
2014-07-18 9:31 ` [PATCH 6/9] usb: musb: core: properly setup the HW before registering it to the USB core Lothar Waßmann
2014-07-18 9:31 ` [PATCH 7/9] usb: phy: am335x: setup the gen_phy function pointers _before_ adding the phy Lothar Waßmann
2014-07-18 9:31 ` [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown() Lothar Waßmann
2014-07-18 9:31 ` [PATCH 9/9] usb: musb: musb_am335x: reinstate module loading/unloading support Lothar Waßmann
2014-07-18 14:04 ` Felipe Balbi
2014-07-22 7:49 ` Lothar Waßmann
2014-07-22 14:47 ` Felipe Balbi
2014-07-18 13:57 ` [PATCH 8/9] usb: phy: am335x: call usb_gen_phy_init()/usb_gen_phy_shutdown() in am335x_init()/am335x_shutdown() Felipe Balbi
2014-07-21 8:03 ` Lothar Waßmann
2014-07-21 15:10 ` Felipe Balbi
2014-07-22 8:06 ` Lothar Waßmann
2014-07-22 14:47 ` Felipe Balbi
2014-07-18 13:54 ` [PATCH 7/9] usb: phy: am335x: setup the gen_phy function pointers _before_ adding the phy Felipe Balbi
2014-07-18 13:52 ` [PATCH 6/9] usb: musb: core: properly setup the HW before registering it to the USB core Felipe Balbi
2014-07-18 13:50 ` [PATCH 5/9] usb: musb: print error message with dev_err() instead of dev_dbg() Felipe Balbi
2014-07-18 13:50 ` [PATCH 4/9] usb: phy: am335x-control: prevent module from being unloaded when in use Felipe Balbi
2014-07-18 13:45 ` [PATCH 3/9] usb: musb_am335x: source cleanup Felipe Balbi
2014-07-18 13:45 ` [PATCH 2/9] usb: phy: am335x: group the #includes by subdirs Felipe Balbi
2014-07-18 13:44 ` [PATCH 1/9] usb: musb: core: cleanup - remove some useless 'break's from switch statements Felipe Balbi
2014-07-18 16:16 ` [PATCH 0/9] usb: musb: several bugfixes for the musb driver Ezequiel Garcia
2014-07-18 16:50 ` Felipe Balbi
2014-07-21 7:34 ` Lothar Waßmann
2014-07-21 15:11 ` Felipe Balbi
2014-07-21 15:53 ` Ezequiel Garcia
2014-07-21 15:58 ` Felipe Balbi
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=1405675890-8802-5-git-send-email-LW@KARO-electronics.de \
--to=lw@karo-electronics.de \
--cc=balbi@ti.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=george.cherian@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=rogerq@ti.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome