Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...

[cascardo/linux.git] / drivers / uio / uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index bcc1fc0..fba021f 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -271,12 +271,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_kobj;
+               }
                kobject_init(&map->kobj, &map_attr_type);
                map->mem = mem;
                mem->map = map;
@@ -296,12 +300,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_kobj;
+               }
                kobject_init(&portio->kobj, &portio_attr_type);
                portio->port = port;
                port->portio = portio;