diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/media/video/usbvision/usbvision-video.c | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 6248a639ba2d..c2690df33438 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
| @@ -1671,8 +1671,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf) | |||
| 1671 | PDEBUG(DBG_PROBE, ""); | 1671 | PDEBUG(DBG_PROBE, ""); |
| 1672 | 1672 | ||
| 1673 | if (usbvision == NULL) { | 1673 | if (usbvision == NULL) { |
| 1674 | dev_err(&usbvision->dev->dev, | 1674 | pr_err("%s: usb_get_intfdata() failed\n", __func__); |
| 1675 | "%s: usb_get_intfdata() failed\n", __func__); | ||
| 1676 | return; | 1675 | return; |
| 1677 | } | 1676 | } |
| 1678 | 1677 | ||