Commit 0de6fd5f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

wwan: core: Unshadow error code returned by ida_alloc_range()

ida_alloc_range() may return other than -ENOMEM error code.
Unshadow it in the wwan_create_port().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7428022b
...@@ -355,8 +355,8 @@ struct wwan_port *wwan_create_port(struct device *parent, ...@@ -355,8 +355,8 @@ struct wwan_port *wwan_create_port(struct device *parent,
{ {
struct wwan_device *wwandev; struct wwan_device *wwandev;
struct wwan_port *port; struct wwan_port *port;
int minor, err = -ENOMEM;
char namefmt[0x20]; char namefmt[0x20];
int minor, err;
if (type > WWAN_PORT_MAX || !ops) if (type > WWAN_PORT_MAX || !ops)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -370,11 +370,14 @@ struct wwan_port *wwan_create_port(struct device *parent, ...@@ -370,11 +370,14 @@ struct wwan_port *wwan_create_port(struct device *parent,
/* A port is exposed as character device, get a minor */ /* A port is exposed as character device, get a minor */
minor = ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL); minor = ida_alloc_range(&minors, 0, WWAN_MAX_MINORS - 1, GFP_KERNEL);
if (minor < 0) if (minor < 0) {
err = minor;
goto error_wwandev_remove; goto error_wwandev_remove;
}
port = kzalloc(sizeof(*port), GFP_KERNEL); port = kzalloc(sizeof(*port), GFP_KERNEL);
if (!port) { if (!port) {
err = -ENOMEM;
ida_free(&minors, minor); ida_free(&minors, minor);
goto error_wwandev_remove; goto error_wwandev_remove;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment