aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohann Neuhauser <johann@it-neuhauser.de>2020-04-28 23:20:13 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-03 16:49:28 +0200
commit1d9812f48aa1f57a8917d3351f0a4f7c8d559755 (patch)
tree13b1b177046f1566ef954758f30de62c6c325ece /target
parent880c1f0336616b0b5692ff284f83923011c548f2 (diff)
downloadupstream-1d9812f48aa1f57a8917d3351f0a4f7c8d559755.tar.gz
upstream-1d9812f48aa1f57a8917d3351f0a4f7c8d559755.tar.bz2
upstream-1d9812f48aa1f57a8917d3351f0a4f7c8d559755.zip
ath79: phy-ar7200-usb: do not print error on defered init
This is only a cosmetic correction, as the driver works as expected. However, the error message confuses users about a missing reset definition. On a defered init we don't see the following error message now: [ 0.078292] ar7200-usb-phy usb-phy: phy reset is missing Tested-by: Lech Perczak <lech.perczak@gmail.com> Signed-off-by: Johann Neuhauser <johann@it-neuhauser.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch5
-rw-r--r--target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch5
2 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch
index fa3487d392..3629e6e875 100644
--- a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch
+++ b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch
@@ -194,7 +194,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_LICENSE("GPL");
--- /dev/null
+++ b/drivers/phy/phy-ar7200-usb.c
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
+ *
@@ -265,7 +265,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
+
+ priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
+ if (IS_ERR(priv->rst_phy)) {
-+ dev_err(&pdev->dev, "phy reset is missing\n");
++ if (PTR_ERR(priv->rst_phy) != -EPROBE_DEFER)
++ dev_err(&pdev->dev, "phy reset is missing\n");
+ return PTR_ERR(priv->rst_phy);
+ }
+
diff --git a/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch
index 7956edb937..e319f738a5 100644
--- a/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch
+++ b/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch
@@ -194,7 +194,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_LICENSE("GPL");
--- /dev/null
+++ b/drivers/phy/phy-ar7200-usb.c
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
+ *
@@ -265,7 +265,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
+
+ priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
+ if (IS_ERR(priv->rst_phy)) {
-+ dev_err(&pdev->dev, "phy reset is missing\n");
++ if (PTR_ERR(priv->rst_phy) != -EPROBE_DEFER)
++ dev_err(&pdev->dev, "phy reset is missing\n");
+ return PTR_ERR(priv->rst_phy);
+ }
+