[PATCH] misc arm pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -346,7 +346,7 @@ static void dm9000_timeout(struct net_device *dev)
|
|||||||
static void dm9000_poll_controller(struct net_device *dev)
|
static void dm9000_poll_controller(struct net_device *dev)
|
||||||
{
|
{
|
||||||
disable_irq(dev->irq);
|
disable_irq(dev->irq);
|
||||||
dm9000_interrupt(dev->irq,dev,NULL);
|
dm9000_interrupt(dev->irq,dev);
|
||||||
enable_irq(dev->irq);
|
enable_irq(dev->irq);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -1551,7 +1551,7 @@ return_urb:
|
|||||||
ep->already_seen = ep->setup_stage = 0;
|
ep->already_seen = ep->setup_stage = 0;
|
||||||
|
|
||||||
spin_unlock (&dum->lock);
|
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);
|
spin_lock (&dum->lock);
|
||||||
|
|
||||||
goto restart;
|
goto restart;
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) { \
|
if (!(action->flags & IRQF_TIMER) && system_timer->dyn_tick) { \
|
||||||
write_seqlock(&xtime_lock); \
|
write_seqlock(&xtime_lock); \
|
||||||
if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \
|
if (system_timer->dyn_tick->state & DYN_TICK_ENABLED) \
|
||||||
system_timer->dyn_tick->handler(irq, 0, regs); \
|
system_timer->dyn_tick->handler(irq, NULL); \
|
||||||
write_sequnlock(&xtime_lock); \
|
write_sequnlock(&xtime_lock); \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -372,7 +372,7 @@ static void vidc_audio_trigger(int dev, int enable_bits)
|
|||||||
adev->flags |= DMA_ACTIVE;
|
adev->flags |= DMA_ACTIVE;
|
||||||
|
|
||||||
dma_interrupt = vidc_audio_dma_interrupt;
|
dma_interrupt = vidc_audio_dma_interrupt;
|
||||||
vidc_sound_dma_irq(0, NULL, NULL);
|
vidc_sound_dma_irq(0, NULL);
|
||||||
iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);
|
iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);
|
||||||
|
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
|
Reference in New Issue
Block a user