diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/media/video/usbvideo/konicawc.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media/video/usbvideo/konicawc.c')
| -rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index 4eee8be88314..abe214619092 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
| @@ -387,7 +387,7 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb) | |||
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | 389 | ||
| 390 | static void konicawc_isoc_irq(struct urb *urb, struct pt_regs *regs) | 390 | static void konicawc_isoc_irq(struct urb *urb) |
| 391 | { | 391 | { |
| 392 | struct uvd *uvd = urb->context; | 392 | struct uvd *uvd = urb->context; |
| 393 | struct konicawc *cam = (struct konicawc *)uvd->user_data; | 393 | struct konicawc *cam = (struct konicawc *)uvd->user_data; |