korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

phy: for 5.0 -rc

Browse Source 
*) Fix de-reference before null check in TI's phy-gmii-sel driver
  *) Fix build breakage in AHCI platform driver (patch was merged in AHCI
     before dependent patches were merged in PHY layer)
  *) Fix the power on error path in ath79-usb PHY driver
  *) Fix the reset binding name to match the DT binding documentation in
     ath79-usb PHY driver.
 
 Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQJCBAABCgAsFiEEUXMr/TfP2p4suIY5Dlx4XIBNgtkFAlxBkQAOHGtpc2hvbkB0
 aS5jb20ACgkQDlx4XIBNgtlBrxAAjXJ3QMXQKb89fhLJUVwT2TmOjiGWy8xOnmuJ
 iB4zsiq9x4kwo0vpbVA9Grd9Ided6CFwMVroOzObCLFsflffHZA6tPAmSlK7SuqG
 /QVhy0Mp3c8RbEOgw1INzKf6Hw4wKoLOtg/t7YCZEmKJHYKdMVU0HPYjJHxO9bXH
 pqRZRBr4t5DPBnaqQ3QacOQ8JRg/uPmUkf1ekZPVU+VYJJBeadKIsmkGGPS40C4M
 P3pAWMLoM/yA2DM2TGvmCHWTLBhGInLZUzGztkznic0z3CSwNL9lJw2HLSUYZYsC
 NeC3Ewg+rk5col2Ku06guSo6oemJNBamW4T8R89CB7F5K1XUujhdUn2LhH5KDCoQ
 XnUbbBCpgmNoo/iWd4+ZbFMSGhrRFZJSgV7ZDKSTY1GZ2k1n99Q3SEJ6Iu/gRWk7
 Gloh+Y0hN70tq/JX/immzUHW8nWWlSI2aJISbi7Mgcj2iKVPUY0iBPRBFrS4XxfW
 7iIigFtAfI6tPbkn0tlRNMu3QvrOWgTkNmjWO/aukfQcMCVgSbDdmbqR53GkAMqJ
 0viRDHE6gLmyOkkL09nt1qBubECIbZUGD/KUHJQS0LaHikx/eC3FnwrbyhNK0Nyq
 rEpyRUORg4KjJB28d1t/UdYQS32tbJ9vw7ohPK8HsMyUQwiws9ADy01qSByfrgwq
 /wdyVeQ=
 =8rVH
 -----END PGP SIGNATURE-----

Merge tag 'phy-for-5.0-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus

Kishon writes:

phy: for 5.0 -rc

 *) Fix de-reference before null check in TI's phy-gmii-sel driver
 *) Fix build breakage in AHCI platform driver (patch was merged in AHCI
    before dependent patches were merged in PHY layer)
 *) Fix the power on error path in ath79-usb PHY driver
 *) Fix the reset binding name to match the DT binding documentation in
    ath79-usb PHY driver.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

* tag 'phy-for-5.0-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy:
  phy: ath79-usb: Fix the main reset name to match the DT binding
  phy: ath79-usb: Fix the power on error path
  phy: fix build breakage: add PHY_MODE_SATA
  phy: ti: ensure priv is not null before dereferencing it
This commit is contained in:
Greg Kroah-Hartman 2019-01-18 12:54:46 +01:00
commit af707f58d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/phy/qualcomm/phy-ath79-usb.c
View File

@ -31,7 +31,7 @@ static int ath79_usb_phy_power_on(struct phy *phy)
err = reset_control_deassert(priv->reset);
if (err && priv->no_suspend_override)
reset_control_assert(priv->no_suspend_override);
reset_control_deassert(priv->no_suspend_override);
return err;
}
@ -69,7 +69,7 @@ static int ath79_usb_phy_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
priv->reset = devm_reset_control_get(&pdev->dev, "usb-phy");
priv->reset = devm_reset_control_get(&pdev->dev, "phy");
if (IS_ERR(priv->reset))
return PTR_ERR(priv->reset);

4
drivers/phy/ti/phy-gmii-sel.c
View File

@ -204,11 +204,11 @@ static struct phy *phy_gmii_sel_of_xlate(struct device *dev,
if (args->args_count < 1)
return ERR_PTR(-EINVAL);
if (!priv || !priv->if_phys)
return ERR_PTR(-ENODEV);
if (priv->soc_data->features & BIT(PHY_GMII_SEL_RMII_IO_CLK_EN) &&
args->args_count < 2)
return ERR_PTR(-EINVAL);
if (!priv || !priv->if_phys)
return ERR_PTR(-ENODEV);
if (phy_id > priv->soc_data->num_ports)
return ERR_PTR(-EINVAL);
if (phy_id != priv->if_phys[phy_id - 1].id)