Merge tag 'usb-ci-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...

[android-x86/kernel.git] / drivers / usb / chipidea / core.c

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index b17ed3a..43ea5fb 100644 (file)
--- 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) {
@@ -887,7 +887,7 @@ static struct attribute *ci_attrs[] = {
        NULL,
 };
 
-static struct attribute_group ci_attr_group = {
+static const struct attribute_group ci_attr_group = {
        .attrs = ci_attrs,
 };