+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 <[email protected]>
Acked-by: Roger Quadros <[email protected]> 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; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
