CHROMIUM: Input: cyapa - return -ENOMEM if kasprintf fails in probe
authorDaniel Kurtz <djkurtz@chromium.org>
Thu, 5 Jul 2012 06:16:55 +0000 (14:16 +0800)
committerGerrit <chrome-bot@google.com>
Fri, 6 Jul 2012 04:49:04 +0000 (21:49 -0700)
"ret" is being returned unitialized in this error path.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=chromium-os:32389
TEST=builds without this warning:
  cyapa.c: In function 'cyapa_probe':
  cyapa.c:1779:6: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: I8ba5ecf03a99d13df808cf83b7a68a13d3891fab
Reviewed-on: https://gerrit.chromium.org/gerrit/26803
Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>

drivers/input/mouse/cyapa.c

index 90cf202..d9dfd2f 100644 (file)
@@ -1798,8 +1798,10 @@ static int __devinit cyapa_probe(struct i2c_client *client,
        i2c_set_clientdata(client, cyapa);
        cyapa->phys = kasprintf(GFP_KERNEL, "i2c-%d-%04x/input0",
                                client->adapter->nr, client->addr);
-       if (!cyapa->phys)
+       if (!cyapa->phys) {
+               ret = -ENOMEM;
                goto err_mem_free;
+       }
 
        cyapa->adapter_func = adapter_func;
        /* i2c isn't supported, set smbus */