This fixes an oops on unbind / module unload (on the musb omap2430
platform).
musb_remove function now calls musb_platform_exit before disabling
runtime pm.
Signed-off-by: Merlijn Wajer <[email protected]>
---
drivers/usb/musb/musb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index e2e95071328a..fb1d88183ea1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2474,11 +2474,11 @@ static int musb_remove(struct platform_device *pdev)
musb_disable_interrupts(musb);
musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
spin_unlock_irqrestore(&musb->lock, flags);
+ musb_platform_exit(musb);
pm_runtime_dont_use_autosuspend(musb->controller);
pm_runtime_put_sync(musb->controller);
pm_runtime_disable(musb->controller);
- musb_platform_exit(musb);
musb_phy_callback = NULL;
if (musb->dma_controller)
musb_dma_controller_destroy(musb->dma_controller);
--
2.16.2
Hi,
On Thu, Mar 08, 2018 at 11:19:48PM +0100, Merlijn Wajer wrote:
> This fixes an oops on unbind / module unload (on the musb omap2430
> platform).
>
> musb_remove function now calls musb_platform_exit before disabling
> runtime pm.
>
> Signed-off-by: Merlijn Wajer <[email protected]>
Applied. Thanks.
Regards,
-Bin.
Hi Bin,
On 09/03/18 15:11, Bin Liu wrote:
> Hi,
>
> On Thu, Mar 08, 2018 at 11:19:48PM +0100, Merlijn Wajer wrote:
>> This fixes an oops on unbind / module unload (on the musb omap2430
>> platform).
>>
>> musb_remove function now calls musb_platform_exit before disabling
>> runtime pm.
>>
>> Signed-off-by: Merlijn Wajer <[email protected]>
>
> Applied. Thanks.
Thank you. Is there any chance that this patch and the vbus patch could
end up in the 4.16-rc series? I was waiting for another rc to see if the
vbus patch would land, but it didn't land with 4.16-rc5.
Cheers,
Merlijn
Hi,
On Mon, Mar 12, 2018 at 11:30:39PM +0100, Merlijn Wajer wrote:
> Hi Bin,
>
> On 09/03/18 15:11, Bin Liu wrote:
> > Hi,
> >
> > On Thu, Mar 08, 2018 at 11:19:48PM +0100, Merlijn Wajer wrote:
> >> This fixes an oops on unbind / module unload (on the musb omap2430
> >> platform).
> >>
> >> musb_remove function now calls musb_platform_exit before disabling
> >> runtime pm.
> >>
> >> Signed-off-by: Merlijn Wajer <[email protected]>
> >
> > Applied. Thanks.
>
> Thank you. Is there any chance that this patch and the vbus patch could
> end up in the 4.16-rc series? I was waiting for another rc to see if the
> vbus patch would land, but it didn't land with 4.16-rc5.
Those two patches are already in the upstream tree, hopefully they will
be in the v4.16-rc.
Regards,
-Bin.