diff options
| author | NeilBrown <neilb@suse.de> | 2012-01-25 10:02:46 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-01-25 10:02:46 +0200 |
| commit | b30b3c60a25a4afbc49167ecb6210c291178ee5f (patch) | |
| tree | 43cf8b83ba47e8e07889ecae0f2ae33dd41a4400 /drivers/usb | |
| parent | c09d6b51d78f5ad33417dbac9b479bd6709f9f25 (diff) | |
| download | talos-obmc-linux-b30b3c60a25a4afbc49167ecb6210c291178ee5f.tar.gz talos-obmc-linux-b30b3c60a25a4afbc49167ecb6210c291178ee5f.zip | |
usb: musb: omap2430: minor cleanups.
1/ remove incorrect comment (it is a non-blocking notifier)
2/ Use correct symbolic return value for notifier
3/ Make sure otg_notifier_work is cancelled before module exit.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index c27bbbf32b52..df719eae3b03 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -222,7 +222,6 @@ static inline void omap2430_low_level_init(struct musb *musb) musb_writel(musb->mregs, OTG_FORCESTDBY, l); } -/* blocking notifier support */ static int musb_otg_notifications(struct notifier_block *nb, unsigned long event, void *unused) { @@ -231,7 +230,7 @@ static int musb_otg_notifications(struct notifier_block *nb, musb->xceiv_event = event; schedule_work(&musb->otg_notifier_work); - return 0; + return NOTIFY_OK; } static void musb_otg_notifier_work(struct work_struct *data_notifier_work) @@ -386,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb) static int omap2430_musb_exit(struct musb *musb) { del_timer_sync(&musb_idle_timer); + cancel_work_sync(&musb->otg_notifier_work); omap2430_low_level_exit(musb); otg_put_transceiver(musb->xceiv); |
