projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.9 to 4.9.96
[openwrt/staging/wigyori.git]
/
target
/
linux
/
ar71xx
/
patches-4.9
/
930-chipidea-pullup.patch
diff --git
a/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
b/target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
index ce31595d967aef096c7f678311efbc0c5b5b2be9..1c4ef3891c5f7d706d891679cd2fc28da2634c04 100644
(file)
--- a/
target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
+++ b/
target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
@@
-22,7
+22,7
@@
{
ci_hdrc_gadget_destroy(ci);
ci_hdrc_host_destroy(ci);
{
ci_hdrc_gadget_destroy(ci);
ci_hdrc_host_destroy(ci);
-- if (ci->is_otg)
+- if (ci->is_otg
&& ci->roles[CI_ROLE_GADGET]
)
+ if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET])
ci_hdrc_otg_destroy(ci);
}
+ if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET])
ci_hdrc_otg_destroy(ci);
}
@@
-37,8
+37,8
@@
ret = hw_device_init(ci, base);
if (ret < 0) {
dev_err(dev, "can't initialize hardware\n");
ret = hw_device_init(ci, base);
if (ret < 0) {
dev_err(dev, "can't initialize hardware\n");
-@@ -9
55,7 +958
,7 @@ static int ci_hdrc_probe(struct platform
- goto deinit_
phy
;
+@@ -9
63,7 +966
,7 @@ static int ci_hdrc_probe(struct platform
+ goto deinit_
gadget
;
}
- if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {
}
- if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {