From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752612AbdJPMub (ORCPT ); Mon, 16 Oct 2017 08:50:31 -0400 Received: from fllnx210.ext.ti.com ([198.47.19.17]:19132 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751448AbdJPMu3 (ORCPT ); Mon, 16 Oct 2017 08:50:29 -0400 Date: Mon, 16 Oct 2017 07:49:49 -0500 From: Bin Liu To: Jonathan Liu CC: Greg Kroah-Hartman , Maxime Ripard , Chen-Yu Tsai , , linux-arm-kernel , linux-kernel , linux-sunxi Subject: Re: [PATCH v2] usb: musb: sunxi: Explicitly release USB PHY on exit Message-ID: <20171016124949.GA73@LTA0271908.dhcp.ti.com> Mail-Followup-To: Bin Liu , Jonathan Liu , Greg Kroah-Hartman , Maxime Ripard , Chen-Yu Tsai , linux-usb@vger.kernel.org, linux-arm-kernel , linux-kernel , linux-sunxi References: <20171010024525.21971-1-net147@gmail.com> <20171010032252.GA25830@uda0271908> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 16, 2017 at 04:13:51PM +1100, Jonathan Liu wrote: > On 10 October 2017 at 14:22, Bin Liu wrote: > > On Tue, Oct 10, 2017 at 01:45:25PM +1100, Jonathan Liu wrote: > >> 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. > >> > >> Cc: stable@vger.kernel.org # v4.3+ > >> Signed-off-by: Jonathan Liu > >> --- > >> Changes for v2: > >> - Use devm_usb_put_phy instead of usb_put_phy > >> > >> drivers/usb/musb/sunxi.c | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c > >> index c9a09b5bb6e5..dc353e24d53c 100644 > >> --- a/drivers/usb/musb/sunxi.c > >> +++ b/drivers/usb/musb/sunxi.c > >> @@ -297,6 +297,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; > >> } > > > > > > > Applied. Thanks. > > -Bin. > > Which repository was it applied to? I don't have a public repo (yet), but the patch has been sent to Greg, so it should be merged into the next -rc. Regards, -Bin.