diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 15:00:12 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 12:32:36 -0700 |
| commit | 28431146993e0ab3a2a592af8541543fe0cc2c8e (patch) | |
| tree | 669550724d03d9a9b829a5d6229f28fcb0d46cc0 /drivers | |
| parent | [PATCH] missed ia64 pt_regs fixes (diff) | |
| download | linux-dev-28431146993e0ab3a2a592af8541543fe0cc2c8e.tar.xz linux-dev-28431146993e0ab3a2a592af8541543fe0cc2c8e.zip | |
[PATCH] misc arm pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dm9000.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 3641f3b4a2cc..615d2b14efa7 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -346,7 +346,7 @@ static void dm9000_timeout(struct net_device *dev) static void dm9000_poll_controller(struct net_device *dev) { disable_irq(dev->irq); - dm9000_interrupt(dev->irq,dev,NULL); + dm9000_interrupt(dev->irq,dev); enable_irq(dev->irq); } #endif diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 4d2946e540cf..f1f32d7be5f9 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c @@ -1551,7 +1551,7 @@ return_urb: ep->already_seen = ep->setup_stage = 0; spin_unlock (&dum->lock); - usb_hcd_giveback_urb (dummy_to_hcd(dum), urb, NULL); + usb_hcd_giveback_urb (dummy_to_hcd(dum), urb); spin_lock (&dum->lock); goto restart; |