On Fri, May 25, 2018 at 08:33:26PM +0200, Marek Vasut wrote: > If the Gen3 PHY fails to power up, the code does not undo the > initialization caused by phy_init(). Add the missing failure > handling to the rcar_pcie_phy_init_gen3() function. > > Signed-off-by: Marek Vasut <[email protected]> > Reported-by: Geert Uytterhoeven <[email protected]> > Cc: Geert Uytterhoeven <[email protected]> > Cc: Lorenzo Pieralisi <[email protected]> > Cc: Phil Edworthy <[email protected]> > Cc: Simon Horman <[email protected]> > Cc: Wolfram Sang <[email protected]> > Cc: [email protected] > Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") > --- > drivers/pci/host/pcie-rcar.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-)
Applied to pci/controller-fixes to be tentatively merged for -rc4, thanks. Lorenzo > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 695781934f0a..477bf40cc031 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -678,7 +678,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie > *pcie) > if (err) > return err; > > - return phy_power_on(pcie->phy); > + err = phy_power_on(pcie->phy); > + if (err) > + phy_exit(pcie->phy); > + > + return err; > } > > static int rcar_msi_alloc(struct rcar_msi *chip) > -- > 2.16.2 >
