diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:30 -0400 |
| commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
| tree | 2cad553a9def773ce79b8fc793f89c0634187109 /drivers/usb/misc/usblcd.c | |
| parent | 89ccf465abe6b20d804a63ae20307970c441369d (diff) | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 */ |