diff options
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 98244d51c154..c4fae8ff4671 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -230,7 +230,7 @@ EXPORT_SYMBOL(au1xxx_ddma_add_device); | |||
230 | */ | 230 | */ |
231 | u32 | 231 | u32 |
232 | au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, | 232 | au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, |
233 | void (*callback)(int, void *, struct pt_regs *), void *callparam) | 233 | void (*callback)(int, void *), void *callparam) |
234 | { | 234 | { |
235 | unsigned long flags; | 235 | unsigned long flags; |
236 | u32 used, chan, rv; | 236 | u32 used, chan, rv; |
@@ -248,8 +248,10 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, | |||
248 | au1xxx_dbdma_init(); | 248 | au1xxx_dbdma_init(); |
249 | dbdma_initialized = 1; | 249 | dbdma_initialized = 1; |
250 | 250 | ||
251 | if ((stp = find_dbdev_id(srcid)) == NULL) return 0; | 251 | if ((stp = find_dbdev_id(srcid)) == NULL) |
252 | if ((dtp = find_dbdev_id(destid)) == NULL) return 0; | 252 | return 0; |
253 | if ((dtp = find_dbdev_id(destid)) == NULL) | ||
254 | return 0; | ||
253 | 255 | ||
254 | used = 0; | 256 | used = 0; |
255 | rv = 0; | 257 | rv = 0; |
@@ -869,7 +871,7 @@ dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
869 | au_sync(); | 871 | au_sync(); |
870 | 872 | ||
871 | if (ctp->chan_callback) | 873 | if (ctp->chan_callback) |
872 | (ctp->chan_callback)(irq, ctp->chan_callparam, regs); | 874 | (ctp->chan_callback)(irq, ctp->chan_callparam); |
873 | 875 | ||
874 | ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); | 876 | ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); |
875 | return IRQ_RETVAL(1); | 877 | return IRQ_RETVAL(1); |