diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 10:00:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:32:36 -0400 |
commit | 28431146993e0ab3a2a592af8541543fe0cc2c8e (patch) | |
tree | 669550724d03d9a9b829a5d6229f28fcb0d46cc0 | |
parent | 5dcded1b0b4f1537bb6dff453fb805517756c94b (diff) |
[PATCH] misc arm pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/net/dm9000.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 2 | ||||
-rw-r--r-- | include/asm-arm/hw_irq.h | 2 | ||||
-rw-r--r-- | sound/oss/vidc.c | 2 |
4 files changed, 4 insertions, 4 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) | |||
346 | static void dm9000_poll_controller(struct net_device *dev) | 346 | static void dm9000_poll_controller(struct net_device *dev) |
347 | { | 347 | { |
348 | disable_irq(dev->irq); | 348 | disable_irq(dev->irq); |
349 | dm9000_interrupt(dev->irq,dev,NULL); | 349 | dm9000_interrupt(dev->irq,dev); |
350 | enable_irq(dev->irq); | 350 | enable_irq(dev->irq); |
351 | } | 351 | } |
352 | #endif | 352 | #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: | |||
1551 | ep->already_seen = ep->setup_stage = 0; | 1551 | ep->already_seen = ep->setup_stage = 0; |
1552 | 1552 | ||
1553 | spin_unlock (&dum->lock); | 1553 | spin_unlock (&dum->lock); |
1554 | usb_hcd_giveback_urb (dummy_to_hcd(dum), urb, NULL); | 1554 | usb_hcd_giveback_urb (dummy_to_hcd(dum), urb); |
1555 | spin_lock (&dum->lock); | 1555 | spin_lock (&dum->lock); |
1556 | 1556 | ||
1557 | goto restart; | 1557 | goto restart; |
diff --git a/include/asm-arm/hw_irq.h b/include/asm-arm/hw_irq.h index ea856971989a..98d594a973d6 100644 --- a/include/asm-arm/hw_irq.h +++ b/include/asm-arm/hw_irq.h | |||
@@ -12,7 +12,7 @@ | |||
12 | if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) { \ | 12 | if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) { \ |
13 | write_seqlock(&xtime_lock); \ | 13 | write_seqlock(&xtime_lock); \ |
14 | if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \ | 14 | if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \ |
15 | system_timer->dyn_tick->handler(irq, 0, regs); \ | 15 | system_timer->dyn_tick->handler(irq, NULL); \ |
16 | write_sequnlock(&xtime_lock); \ | 16 | write_sequnlock(&xtime_lock); \ |
17 | } | 17 | } |
18 | #endif | 18 | #endif |
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 8932d89408ef..bb4a0969f461 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
@@ -372,7 +372,7 @@ static void vidc_audio_trigger(int dev, int enable_bits) | |||
372 | adev->flags |= DMA_ACTIVE; | 372 | adev->flags |= DMA_ACTIVE; |
373 | 373 | ||
374 | dma_interrupt = vidc_audio_dma_interrupt; | 374 | dma_interrupt = vidc_audio_dma_interrupt; |
375 | vidc_sound_dma_irq(0, NULL, NULL); | 375 | vidc_sound_dma_irq(0, NULL); |
376 | iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR); | 376 | iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR); |
377 | 377 | ||
378 | local_irq_restore(flags); | 378 | local_irq_restore(flags); |