2009-07-25 12:23:09

by Dan Carpenter

Subject: [patch] wireless: ERR_PTR vs null

iwm_wdev_alloc() returns an ERR_PTR on failure and not null. It also
prints its own dev_err() message so I removed that as well.

Compile tested only. Sorry.
Found by smatch (http://repo.or.cz/w/smatch.git).

regards,
dan carpenter

Signed-off-by: Dan Carpenter <[email protected]>

--- orig/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:56:49.000000000 +0300
+++ devel/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:57:31.000000000 +0300
@@ -106,10 +106,8 @@
int ret = 0;

wdev = iwm_wdev_alloc(sizeof_bus, dev);
- if (!wdev) {
- dev_err(dev, "no memory for wireless device instance\n");
- return ERR_PTR(-ENOMEM);
- }
+ if (IS_ERR(wdev))
+ return wdev;

iwm = wdev_to_iwm(wdev);
iwm->bus_ops = if_ops;

2009-07-27 01:27:03

by Zhu Yi

Subject: Re: [patch] wireless: ERR_PTR vs null

On Sat, 2009-07-25 at 20:22 +0800, Dan Carpenter wrote:
> iwm_wdev_alloc() returns an ERR_PTR on failure and not null. It also
> prints its own dev_err() message so I removed that as well.
>
> Compile tested only. Sorry.
> Found by smatch (http://repo.or.cz/w/smatch.git).
>
> regards,
> dan carpenter
>
> Signed-off-by: Dan Carpenter <[email protected]>

Acked-by: Zhu Yi <[email protected]>

Thanks,
-yi

> --- orig/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:56:49.000000000 +0300
> +++ devel/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:57:31.000000000 +0300
> @@ -106,10 +106,8 @@
> int ret = 0;
>
> wdev = iwm_wdev_alloc(sizeof_bus, dev);
> - if (!wdev) {
> - dev_err(dev, "no memory for wireless device instance\n");
> - return ERR_PTR(-ENOMEM);
> - }
> + if (IS_ERR(wdev))
> + return wdev;
>
> iwm = wdev_to_iwm(wdev);
> iwm->bus_ops = if_ops;

2009-07-25 12:46:59

by Marcel Holtmann

Subject: Re: [patch] wireless: ERR_PTR vs null

Hi Dan,

> iwm_wdev_alloc() returns an ERR_PTR on failure and not null. It also
> prints its own dev_err() message so I removed that as well.
>
> Compile tested only. Sorry.
> Found by smatch (http://repo.or.cz/w/smatch.git).
>
> regards,
> dan carpenter
>
> Signed-off-by: Dan Carpenter <[email protected]>
>
> --- orig/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:56:49.000000000 +0300
> +++ devel/drivers/net/wireless/iwmc3200wifi/netdev.c 2009-07-24 09:57:31.000000000 +0300
> @@ -106,10 +106,8 @@
> int ret = 0;
>
> wdev = iwm_wdev_alloc(sizeof_bus, dev);
> - if (!wdev) {
> - dev_err(dev, "no memory for wireless device instance\n");
> - return ERR_PTR(-ENOMEM);
> - }
> + if (IS_ERR(wdev))
> + return wdev;
>
> iwm = wdev_to_iwm(wdev);
> iwm->bus_ops = if_ops;

I just quickly double-checked with the code. Patch looks good.

Regards

Marcel