Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97eba326 authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

usb: roles: Fix return value check in intel_xhci_usb_probe() 



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: f6fb9ec0 ("usb: roles: Add Intel xHCI USB role switch driver")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7fafcfdf

drivers/usb/roles/intel-xhci-usb-role-switch.c

+2 −2
Original line number Diff line number Diff line
@@ -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",