diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/media/video/pvrusb2/pvrusb2-hdw.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 3d8cd0daf6a9..f920e0ccacd3 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
| @@ -2552,7 +2552,7 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,int v) | |||
| 2552 | } | 2552 | } |
| 2553 | 2553 | ||
| 2554 | 2554 | ||
| 2555 | static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) | 2555 | static void pvr2_ctl_write_complete(struct urb *urb) |
| 2556 | { | 2556 | { |
| 2557 | struct pvr2_hdw *hdw = urb->context; | 2557 | struct pvr2_hdw *hdw = urb->context; |
| 2558 | hdw->ctl_write_pend_flag = 0; | 2558 | hdw->ctl_write_pend_flag = 0; |
| @@ -2561,7 +2561,7 @@ static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) | |||
| 2561 | } | 2561 | } |
| 2562 | 2562 | ||
| 2563 | 2563 | ||
| 2564 | static void pvr2_ctl_read_complete(struct urb *urb, struct pt_regs *regs) | 2564 | static void pvr2_ctl_read_complete(struct urb *urb) |
| 2565 | { | 2565 | { |
| 2566 | struct pvr2_hdw *hdw = urb->context; | 2566 | struct pvr2_hdw *hdw = urb->context; |
| 2567 | hdw->ctl_read_pend_flag = 0; | 2567 | hdw->ctl_read_pend_flag = 0; |