]> git.baikalelectronics.ru Git - kernel.git/commitdiff
platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 6 Feb 2018 12:45:36 +0000 (15:45 +0300)
committerDarren Hart (VMware) <dvhart@infradead.org>
Tue, 6 Feb 2018 15:42:38 +0000 (07:42 -0800)
devm_ioport_map() returns NULL on error but we accidentally check for
error pointers instead.

Fixes: c6acad68eb2d ("platform/mellanox: mlxreg-hotplug: Modify to use a regmap interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Vadim Pasternak <vadimp@melanox.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/mlx-platform.c

index dfecba4407ac4a810cc6a9846b6505122c95265b..27de29961f5e194c990ba3f6427aac09ede9e6f1 100644 (file)
@@ -522,8 +522,8 @@ static int __init mlxplat_init(void)
 
        mlxplat_mlxcpld_regmap_ctx.base = devm_ioport_map(&mlxplat_dev->dev,
                               mlxplat_lpc_resources[1].start, 1);
-       if (IS_ERR(mlxplat_mlxcpld_regmap_ctx.base)) {
-               err = PTR_ERR(mlxplat_mlxcpld_regmap_ctx.base);
+       if (!mlxplat_mlxcpld_regmap_ctx.base) {
+               err = -ENOMEM;
                goto fail_platform_mux_register;
        }