]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: roles: Fix return value check in intel_xhci_usb_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 26 Mar 2018 06:43:57 +0000 (06:43 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Mar 2018 09:59:25 +0000 (11:59 +0200)
In case of error, the function devm_ioremap_nocache() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: f6fb9ec02be1 ("usb: roles: Add Intel xHCI USB role switch driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/roles/intel-xhci-usb-role-switch.c

index 58c1b60a33c16357e6053695c603b6ea05f07359..de72eedb762e41689681521147b0ebcbc43d5e11 100644 (file)
@@ -145,8 +145,8 @@ static int intel_xhci_usb_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        data->base = devm_ioremap_nocache(dev, res->start, resource_size(res));
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
+       if (!data->base)
+               return -ENOMEM;
 
        for (i = 0; i < ARRAY_SIZE(allow_userspace_ctrl_ids); i++)
                if (acpi_dev_present(allow_userspace_ctrl_ids[i].hid, "1",