Skip to content

Commit

Permalink
USB: misc: fixup smatch WARNING
Browse files Browse the repository at this point in the history
This patch fixes the warning,

6a099c6 [4/10] USB: misc: Add USB3503 High-Speed Hub Controller

drivers/usb/misc/usb3503.c:238 usb3503_probe() error: we previously assumed 'pdata' could be null (see line 196)

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dongjin Kim authored and Greg Kroah-Hartman committed Jan 17, 2013
1 parent 74ff31b commit 7a8ea7e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/usb/misc/usb3503.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,19 +182,20 @@ 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);
hub->client = i2c;

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;
Expand All @@ -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;
}
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7a8ea7e

Please sign in to comment.