3.16.48-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Dan Carpenter <[email protected]>

commit 0320a278b9ef80cfa44f74b7f9bb36781695f3ee upstream.

My static checker complains that "ret" could be uninitialized at the
end, which is true but it's more likely that it would be set to zero.

Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Ben Hutchings <[email protected]>
---
 drivers/uio/uio.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -283,12 +283,16 @@ static int uio_dev_add_attributes(struct
                        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_kobj;
+               }
                kobject_init(&map->kobj, &map_attr_type);
                map->mem = mem;
                mem->map = map;
@@ -308,12 +312,16 @@ static int uio_dev_add_attributes(struct
                        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_kobj;
+               }
                kobject_init(&portio->kobj, &portio_attr_type);
                portio->port = port;
                port->portio = portio;

Reply via email to