wwan: core: Unshadow error code returned by ida_alloc_range()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 11 Aug 2021 13:39:32 +0000 (16:39 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Aug 2021 09:55:07 +0000 (10:55 +0100)
ida_alloc_range() may return other than -ENOMEM error code.
Unshadow it in the wwan_create_port().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wwan/wwan_core.c

index 674a81d..5f9f57e 100644 (file)
@@ -355,8 +355,8 @@ struct wwan_port *wwan_create_port(struct device *parent,
 {
        struct wwan_device *wwandev;
        struct wwan_port *port;
-       int minor, err = -ENOMEM;
        char namefmt[0x20];
+       int minor, err;
 
        if (type > WWAN_PORT_MAX || !ops)
                return ERR_PTR(-EINVAL);
@@ -370,11 +370,14 @@ struct wwan_port *wwan_create_port(struct device *parent,
 
        /* A port is exposed as character device, get a minor */
        minor = ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL);
-       if (minor < 0)
+       if (minor < 0) {
+               err = minor;
                goto error_wwandev_remove;
+       }
 
        port = kzalloc(sizeof(*port), GFP_KERNEL);
        if (!port) {
+               err = -ENOMEM;
                ida_free(&minors, minor);
                goto error_wwandev_remove;
        }