diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/usb/misc/usblcd.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/usb/misc/usblcd.c')
| -rw-r--r-- | drivers/usb/misc/usblcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index 29092b8e59ce..4fb120357c55 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c | |||
| @@ -313,7 +313,8 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
| 313 | 313 | ||
| 314 | if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) { | 314 | if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) { |
| 315 | dev_warn(&interface->dev, "USBLCD model not supported.\n"); | 315 | dev_warn(&interface->dev, "USBLCD model not supported.\n"); |
| 316 | return -ENODEV; | 316 | retval = -ENODEV; |
| 317 | goto error; | ||
| 317 | } | 318 | } |
| 318 | 319 | ||
| 319 | /* set up the endpoint information */ | 320 | /* set up the endpoint information */ |