diff options
| author | Vinod Koul <vkoul@kernel.org> | 2022-10-28 18:39:28 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-10-28 18:39:28 +0530 |
| commit | 25dcaf94448f41f1634e8e44f28f37b1aff4bc2c (patch) | |
| tree | dcee8deb3839c8a45bd9753c6391d5c510e746b1 /drivers/phy/tegra | |
| parent | 0e089bb8b31f7651d364723122af7ba7be7b98a9 (diff) | |
| parent | 04948e757148f870a31f4887ea2239403f516c3c (diff) | |
| download | linux-25dcaf94448f41f1634e8e44f28f37b1aff4bc2c.tar.gz linux-25dcaf94448f41f1634e8e44f28f37b1aff4bc2c.tar.bz2 linux-25dcaf94448f41f1634e8e44f28f37b1aff4bc2c.zip | |
Merge branch 'fixes' into next
Merge the fixes to next as both carry qmp-phy patches
Diffstat (limited to 'drivers/phy/tegra')
| -rw-r--r-- | drivers/phy/tegra/xusb.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c index 95091876c422..dce45fbbd699 100644 --- a/drivers/phy/tegra/xusb.c +++ b/drivers/phy/tegra/xusb.c @@ -1461,8 +1461,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_port_reset); void tegra_phy_xusb_utmi_pad_power_on(struct phy *phy) { - struct tegra_xusb_lane *lane = phy_get_drvdata(phy); - struct tegra_xusb_padctl *padctl = lane->pad->padctl; + struct tegra_xusb_lane *lane; + struct tegra_xusb_padctl *padctl; + + if (!phy) + return; + + lane = phy_get_drvdata(phy); + padctl = lane->pad->padctl; if (padctl->soc->ops->utmi_pad_power_on) padctl->soc->ops->utmi_pad_power_on(phy); @@ -1471,8 +1477,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_on); void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy) { - struct tegra_xusb_lane *lane = phy_get_drvdata(phy); - struct tegra_xusb_padctl *padctl = lane->pad->padctl; + struct tegra_xusb_lane *lane; + struct tegra_xusb_padctl *padctl; + + if (!phy) + return; + + lane = phy_get_drvdata(phy); + padctl = lane->pad->padctl; if (padctl->soc->ops->utmi_pad_power_down) padctl->soc->ops->utmi_pad_power_down(phy); |