diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 10:12:16 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 10:12:16 +0200 |
| commit | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (patch) | |
| tree | 77ab8003db1d6ccbcf3a9acafad26002fba37b63 /drivers/media | |
| parent | sh: sh7723: Don't default enable the RTC clock. (diff) | |
| parent | sh: Fix mmap2 for handling differing PAGE_SIZEs. (diff) | |
| download | linux-4db25d496c09fdf094d52d11a90ae51f9ee473c6.tar.xz linux-4db25d496c09fdf094d52d11a90ae51f9ee473c6.zip | |
Merge branch 'sh/stable-updates' into sh/for-2.6.30
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index d9d974a8f52a..add3395d3248 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1461,7 +1461,6 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw) return ret; } - usb_settoggle(hdw->usb_dev, 0 & 0xf, !(0 & USB_DIR_IN), 0); usb_clear_halt(hdw->usb_dev, usb_sndbulkpipe(hdw->usb_dev, 0 & 0x7f)); pipe = usb_sndctrlpipe(hdw->usb_dev, 0); |