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/isdn/hisax/st5481_d.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hisax/st5481_d.c')
| -rw-r--r-- | drivers/isdn/hisax/st5481_d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c index 98adec440590..1d8c2618366c 100644 --- a/drivers/isdn/hisax/st5481_d.c +++ b/drivers/isdn/hisax/st5481_d.c | |||
| @@ -370,7 +370,7 @@ static void fifo_reseted(void *context) | |||
| 370 | FsmEvent(&adapter->d_out.fsm, EV_DOUT_RESETED, NULL); | 370 | FsmEvent(&adapter->d_out.fsm, EV_DOUT_RESETED, NULL); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | static void usb_d_out_complete(struct urb *urb, struct pt_regs *regs) | 373 | static void usb_d_out_complete(struct urb *urb) |
| 374 | { | 374 | { |
| 375 | struct st5481_adapter *adapter = urb->context; | 375 | struct st5481_adapter *adapter = urb->context; |
| 376 | struct st5481_d_out *d_out = &adapter->d_out; | 376 | struct st5481_d_out *d_out = &adapter->d_out; |