summaryrefslogtreecommitdiffstats
path: root/drivers/phy/rockchip
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2020-07-17 10:15:53 +0200
committerVinod Koul <vkoul@kernel.org>2020-07-17 10:15:53 +0200
commit6cd84cfc8e872ef7521b6fce75d53ef0b232ad04 (patch)
tree5dfc06e9c97050e395e9e06b1d1f7543c59c24be /drivers/phy/rockchip
parentphy: samsung-ufs: add UFS PHY driver for samsung SoC (diff)
parentphy: sun4i-usb: fix dereference of pointer phy0 before it is null checked (diff)
downloadlinux-6cd84cfc8e872ef7521b6fce75d53ef0b232ad04.tar.xz
linux-6cd84cfc8e872ef7521b6fce75d53ef0b232ad04.zip
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/phy/rockchip')
-rw-r--r--drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
index a7c6c940a3a8..8af8c6c5cc02 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
@@ -607,8 +607,8 @@ static int inno_dsidphy_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, inno);
inno->phy_base = devm_platform_ioremap_resource(pdev, 0);
- if (!inno->phy_base)
- return -ENOMEM;
+ if (IS_ERR(inno->phy_base))
+ return PTR_ERR(inno->phy_base);
inno->ref_clk = devm_clk_get(dev, "ref");
if (IS_ERR(inno->ref_clk)) {