From: Jonathan Liu Date: Tue, 10 Oct 2017 03:46:13 +0000 (-0500) Subject: usb: musb: sunxi: Explicitly release USB PHY on exit X-Git-Tag: v4.9.59~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4ecc15d6f5a13c0bbe2777438e87e321f83faaa;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-4.9-exynos9110.git usb: musb: sunxi: Explicitly release USB PHY on exit commit 6ed05c68cbcae42cd52b8e53b66952bfa9c002ce upstream. This fixes a kernel oops when unloading the driver due to usb_put_phy being called after usb_phy_generic_unregister when the device is detached. Calling usb_phy_generic_unregister causes x->dev->driver to be NULL in usb_put_phy and results in a NULL pointer dereference. Signed-off-by: Jonathan Liu Signed-off-by: Bin Liu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index 1408245..3e1f3da 100644 --- a/drivers/usb/musb/sunxi.c +++ b/drivers/usb/musb/sunxi.c @@ -313,6 +313,8 @@ static int sunxi_musb_exit(struct musb *musb) if (test_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags)) sunxi_sram_release(musb->controller->parent); + devm_usb_put_phy(glue->dev, glue->xceiv); + return 0; }