From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Message-ID: <55080015.7040207@ti.com>
Date: Tue, 17 Mar 2015 12:21:09 +0200
From: Roger Quadros <rogerq@ti.com>
MIME-Version: 1.0
To: Axel Lin <axel.lin@ingics.com>,
	Kishon Vijay Abraham I <kishon@ti.com>
CC: Felipe Balbi <balbi@ti.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	"3.9+" <stable@vger.kernel.org>
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: <stable.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 <axel.lin@ingics.com>

Acked-by: Roger Quadros <rogerq@ti.com>

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;
>