From ae1fc1c96c7938f3ade70c3f736c30c78a684475 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Sat, 12 Jan 2013 20:54:33 +0900 Subject: [PATCH] --- yaml --- r: 354565 b: refs/heads/master c: 7a8ea7ebe4cf698918e7d3c860587e815eaa0f28 h: refs/heads/master i: 354563: 1377b8b8f74f083611bf185da75485db04b361b5 v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/usb3503.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0bf320e54a41..9aee173d901a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ff31b81d94c139882258e9e4a73aca28d05b0a +refs/heads/master: 7a8ea7ebe4cf698918e7d3c860587e815eaa0f28 diff --git a/trunk/drivers/usb/misc/usb3503.c b/trunk/drivers/usb/misc/usb3503.c index c3770734da42..dc2c993ea189 100644 --- a/trunk/drivers/usb/misc/usb3503.c +++ b/trunk/drivers/usb/misc/usb3503.c @@ -182,12 +182,12 @@ static int usb3503_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct usb3503_platform_data *pdata = i2c->dev.platform_data; struct usb3503 *hub; - int err; + int err = -ENOMEM; hub = kzalloc(sizeof(struct usb3503), GFP_KERNEL); if (!hub) { dev_err(&i2c->dev, "private data alloc fail\n"); - return -ENOMEM; + return err; } i2c_set_clientdata(i2c, hub); @@ -195,6 +195,7 @@ static int usb3503_probe(struct i2c_client *i2c, const struct i2c_device_id *id) if (!pdata) { dev_dbg(&i2c->dev, "missing platform data\n"); + goto err_out; } else { hub->gpio_intn = pdata->gpio_intn; hub->gpio_connect = pdata->gpio_connect; @@ -209,7 +210,7 @@ static int usb3503_probe(struct i2c_client *i2c, const struct i2c_device_id *id) dev_err(&i2c->dev, "unable to request GPIO %d as connect pin (%d)\n", hub->gpio_intn, err); - goto err_gpio_intn; + goto err_out; } } @@ -248,7 +249,7 @@ static int usb3503_probe(struct i2c_client *i2c, const struct i2c_device_id *id) err_gpio_connect: if (gpio_is_valid(hub->gpio_intn)) gpio_free(hub->gpio_intn); -err_gpio_intn: +err_out: kfree(hub); return err;