projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 4.4 to version 4.4.19
[openwrt/staging/stintel.git]
/
target
/
linux
/
ipq806x
/
patches-4.4
/
099-usb-dwc3-Remove-impossible-check-for-of_clk_get_pare.patch
diff --git
a/target/linux/ipq806x/patches-4.4/099-usb-dwc3-Remove-impossible-check-for-of_clk_get_pare.patch
b/target/linux/ipq806x/patches-4.4/099-usb-dwc3-Remove-impossible-check-for-of_clk_get_pare.patch
index 44506c1256432e9b275b6203f67fff8074a4d8cc..32f9e34177e9cb23183615aaed480934fba2efc0 100644
(file)
--- a/
target/linux/ipq806x/patches-4.4/099-usb-dwc3-Remove-impossible-check-for-of_clk_get_pare.patch
+++ b/
target/linux/ipq806x/patches-4.4/099-usb-dwc3-Remove-impossible-check-for-of_clk_get_pare.patch
@@
-19,34
+19,29
@@
Signed-off-by: Nitheesh Sekar <nsekar@codeaurora.org>
drivers/usb/dwc3/dwc3-of-simple.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/dwc3/dwc3-of-simple.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
-index 9c9f741..9743353 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
-@@ -42,6 +42,7 @@ static int dwc3_of_simple_probe(struct p
latform_device *pdev)
+@@ -42,6 +42,7 @@ static int dwc3_of_simple_probe(struct p
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
-
+
+ unsigned int count;
int ret;
int i;
+ unsigned int count;
int ret;
int i;
-
-@@ -49,11 +50,11 @@ static int dwc3_of_simple_probe(struct p
latform_device *pdev)
+
+@@ -49,11 +50,11 @@ static int dwc3_of_simple_probe(struct p
if (!simple)
return -ENOMEM;
if (!simple)
return -ENOMEM;
-
+
- ret = of_clk_get_parent_count(np);
- if (ret < 0)
- return ret;
+ count = of_clk_get_parent_count(np);
+ if (!count)
+ return -ENOENT;
- ret = of_clk_get_parent_count(np);
- if (ret < 0)
- return ret;
+ count = of_clk_get_parent_count(np);
+ if (!count)
+ return -ENOENT;
-
+
- simple->num_clocks = ret;
+ simple->num_clocks = count;
- simple->num_clocks = ret;
+ simple->num_clocks = count;
-
+
simple->clks = devm_kcalloc(dev, simple->num_clocks,
sizeof(struct clk *), GFP_KERNEL);
simple->clks = devm_kcalloc(dev, simple->num_clocks,
sizeof(struct clk *), GFP_KERNEL);
---
-2.7.2
-