From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754254AbbCQKVQ (ORCPT ); Tue, 17 Mar 2015 06:21:16 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:39688 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbbCQKVN (ORCPT ); Tue, 17 Mar 2015 06:21:13 -0400 Message-ID: <55080015.7040207@ti.com> Date: Tue, 17 Mar 2015 12:21:09 +0200 From: Roger Quadros User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Axel Lin , Kishon Vijay Abraham I CC: Felipe Balbi , "linux-kernel@vger.kernel.org" , "linux-usb@vger.kernel.org" , "3.9+" Subject: Re: [PATCH] phy: omap-usb2: Fix missing clk_prepare call when using old dt name References: <1426038094.24450.2.camel@phoenix> In-Reply-To: <1426038094.24450.2.camel@phoenix> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org +stable, v3.16+ On 11/03/15 03:41, Axel Lin wrote: > Current code does not call clk_prepare(phy->optclk) when using the old > usb_otg_ss_refclk960m name. Fix it. > > Signed-off-by: Axel Lin Acked-by: Roger Quadros cheers, -roger > --- > drivers/phy/phy-omap-usb2.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c > index 6f4aef3..dcdd850 100644 > --- a/drivers/phy/phy-omap-usb2.c > +++ b/drivers/phy/phy-omap-usb2.c > @@ -296,10 +296,11 @@ static int omap_usb2_probe(struct platform_device *pdev) > dev_warn(&pdev->dev, > "found usb_otg_ss_refclk960m, please fix DTS\n"); > } > - } else { > - clk_prepare(phy->optclk); > } > > + if (!IS_ERR(phy->optclk)) > + clk_prepare(phy->optclk); > + > usb_add_phy_dev(&phy->phy); > > return 0; >