On Tue, Nov 27, 2012 at 01:48:14PM +0200, Vitalii Demianets wrote:
> Fix warning: 'ret' might be used uninitialized
> 
> Signed-off-by: Vitalii Demianets <vi...@nppfactor.kiev.ua>
> ---
>  drivers/uio/uio.c |   16 ++++++++++++----
>  1 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
> index 5110f36..c33fd18 100644
> --- a/drivers/uio/uio.c
> +++ b/drivers/uio/uio.c
> @@ -280,12 +280,16 @@ static int uio_dev_add_attributes(struct uio_device 
> *idev)
>                       map_found = 1;
>                       idev->map_dir = kobject_create_and_add("maps",
>                                                       &idev->dev->kobj);
> -                     if (!idev->map_dir)
> +                     if (!idev->map_dir) {
> +                             ret = -ENOMEM;
>                               goto err_map;
> +                     }
>               }
>               map = kzalloc(sizeof(*map), GFP_KERNEL);
> -             if (!map)
> +             if (!map) {
> +                     ret = -ENOMEM;
>                       goto err_map;
> +             }
>               kobject_init(&map->kobj, &map_attr_type);
>               map->mem = mem;
>               mem->map = map;
> @@ -305,12 +309,16 @@ static int uio_dev_add_attributes(struct uio_device 
> *idev)
>                       portio_found = 1;
>                       idev->portio_dir = kobject_create_and_add("portio",
>                                                       &idev->dev->kobj);
> -                     if (!idev->portio_dir)
> +                     if (!idev->portio_dir) {
> +                             ret = -ENOMEM;
>                               goto err_portio;
> +                     }
>               }
>               portio = kzalloc(sizeof(*portio), GFP_KERNEL);
> -             if (!portio)
> +             if (!portio) {
> +                     ret = -ENOMEM;
>                       goto err_portio;
> +             }
>               kobject_init(&portio->kobj, &portio_attr_type);
>               portio->port = port;
>               port->portio = portio;
> -- 
> 1.7.8.6
> 

Thanks, good catch, but why don't you simply do this:


>From 228445996bb75a44d16b6237eca6a0916d9b2d7e Mon Sep 17 00:00:00 2001
From: "Hans J. Koch" <h...@hansjkoch.de>
Date: Tue, 27 Nov 2012 23:38:00 +0100
Subject: [PATCH] uio: Fix warning: 'ret' might be used uninitialized

In two cases, the return value variable "ret" can be undefined.

Signed-off-by: Hans J. Koch <h...@hansjkoch.de>
---
 drivers/uio/uio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 5110f36..fc60e35 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -263,7 +263,7 @@ static struct class uio_class = {
  */
 static int uio_dev_add_attributes(struct uio_device *idev)
 {
-       int ret;
+       int ret = -ENOMEM;
        int mi, pi;
        int map_found = 0;
        int portio_found = 0;
-- 
1.7.9

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to