From patchwork Tue Oct 10 02:45:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 9994793 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 742FF602DA for ; Tue, 10 Oct 2017 02:45:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64A432239D for ; Tue, 10 Oct 2017 02:45:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 536CF223A6; Tue, 10 Oct 2017 02:45:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CFD382239D for ; Tue, 10 Oct 2017 02:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=riQWGuAb8MBhuXRhEzWJ1840zjqTfAzYgbtLu5+GP+k=; b=cVQ Jr6PoU7O6Zs2/w8h7GB80G9y6FcoT+YverTVibhbMYlhgdQmHKgeP1SY08u5xM+MAnALlDMc7wBZI W1ehOiiRqUE+sprXq48EBmqHcInGunrXY9sI9QPWQoAi1LdrqTtYr5P4GyUMb6p1uyhTxOBev894D 2YK2LxDNLPxWAE0h/E+2O14PFWVDlyyqtkq6jmnBQEhtyqzFqP6SHIyJyTgOCYPylWQMv8brUAJLr uUqjcqMVqqE5cvFAzA41u8d5tcPxEKLxGZBKwVvwDoB1pTQfnldKnp8MymRQMgj6t/OOicR2rIRW4 kbhsxsrdaOwu++jfwVR9tmW5F7+MqSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e1kXg-0006jw-2U; Tue, 10 Oct 2017 02:45:12 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e1kXc-0005x8-Qg for linux-arm-kernel@lists.infradead.org; Tue, 10 Oct 2017 02:45:10 +0000 Received: by mail-pf0-x244.google.com with SMTP id a7so31994081pfj.5 for ; Mon, 09 Oct 2017 19:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KtQX3o8DjLhy+yoCVpxjaCHZR2dekhLRpeTXA7kbDms=; b=FNHJznH94Ya+YyZjM27xYomHsPtZp2LbCNbuqwyqWGJKglbVeBcL5RAdr0xxKtQFdU qGt97EppV+x2Zv+dQ2Rdtyg4Vtmqjh+McPYbvxaD562vaCuM89qXdQx+jnHPHLdEAzqH 9n+RRO1/G9X4+vGP5+NhALxeLDgeHDYAqlRzfjxWVhHmEqdizwYATOJbIJ0/TWTpscdX eSV27sC+mEyCs9FLLfpLVpqlpnbgSa/VJ1mEw1zGKauxxTTUib/fnhYvmCXw5YwZ/BnE /q4EvN5zp0r0B5PZZmtakXGkg9AG1w/SLTcsAAwGjcxnBo2Ll5FNire28LQr/Bvxh/qY p5vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KtQX3o8DjLhy+yoCVpxjaCHZR2dekhLRpeTXA7kbDms=; b=G1RJs/bziz/ypMOb0TvQs6nqxEDIka5c87VM6aEx0M5JSrPPP0TLbRBa4nKbNkuMQr befQaFK2Qf5YYyRHOexPd+8nyyZdpMfaz6bvdWoDODCxvRvEnm4ajKrTM0A/jPadCWCb SqnVMrluUUPckhXDSxD4sTWSIdToR613uhYLYOeKq4Bz2NHKuesEo9JAVmqcnxYBwf65 Tj/94wstHi8tJXGpJBGVyUhGfNoW/HBOOx0MM0bMzLbVKKCvWAmsiKPfPkcxU0boZ3Ew qCPwCvoYgCXHSxQrO91w2c1m/0jh2HeiFgOTsel2eSS6TOpjyNeK1CCymFcf2/9aqaKG eL0A== X-Gm-Message-State: AMCzsaXAOfepwpvaDfUxAFEfE9AehBQzfgK58QdrnFHA5OU2Vf9PanVm gC7r7zgu7UGZsrCJqvAe96E= X-Google-Smtp-Source: AOwi7QBkpU71XZXXl3QY3fCZZDzAsfJCqLvd8aWCLa/twDn4HJs2MKJx/P7484vZC7iBwR+JJnTK3w== X-Received: by 10.98.35.75 with SMTP id j72mr11616007pfj.82.1507603487386; Mon, 09 Oct 2017 19:44:47 -0700 (PDT) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by smtp.gmail.com with ESMTPSA id w69sm6478784pfd.22.2017.10.09.19.44.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 19:44:46 -0700 (PDT) From: Jonathan Liu To: Bin Liu , Greg Kroah-Hartman , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v2] usb: musb: sunxi: Explicitly release USB PHY on exit Date: Tue, 10 Oct 2017 13:45:25 +1100 Message-Id: <20171010024525.21971-1-net147@gmail.com> X-Mailer: git-send-email 2.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171009_194508_992962_071ECAD2 X-CRM114-Status: GOOD ( 10.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sunxi@googlegroups.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jonathan Liu MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }