This issue is detected when the system has another device driver
which registers USB connector extcon device, fix it by adding
extcon device check.

Signed-off-by: Peter Chen <[email protected]>
---
 drivers/usb/chipidea/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index b17ed3a..a91736b 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -736,7 +736,7 @@ static int ci_extcon_register(struct ci_hdrc *ci)
 
        id = &ci->platdata->id_extcon;
        id->ci = ci;
-       if (!IS_ERR(id->edev)) {
+       if (!IS_ERR_OR_NULL(id->edev)) {
                ret = devm_extcon_register_notifier(ci->dev, id->edev,
                                                EXTCON_USB_HOST, &id->nb);
                if (ret < 0) {
@@ -747,7 +747,7 @@ static int ci_extcon_register(struct ci_hdrc *ci)
 
        vbus = &ci->platdata->vbus_extcon;
        vbus->ci = ci;
-       if (!IS_ERR(vbus->edev)) {
+       if (!IS_ERR_OR_NULL(vbus->edev)) {
                ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
                                                EXTCON_USB, &vbus->nb);
                if (ret < 0) {
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to