summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/adb-iop.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-07 15:16:45 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-07 19:51:14 +0200
commit2850bc273776cbb1b510c5828e9e456dffb50a32 (patch)
tree340bd599b6efde40618ef89de59cbe957269eac2 /drivers/macintosh/adb-iop.c
parent[PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block (diff)
downloadlinux-2850bc273776cbb1b510c5828e9e456dffb50a32.tar.xz
linux-2850bc273776cbb1b510c5828e9e456dffb50a32.zip
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh/adb-iop.c')
-rw-r--r--drivers/macintosh/adb-iop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 1ffee7aaff20..17ef5d3c01b4 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -266,7 +266,7 @@ int adb_iop_autopoll(int devs)
void adb_iop_poll(void)
{
if (adb_iop_state == idle) adb_iop_start();
- iop_ism_irq(0, (void *) ADB_IOP, NULL);
+ iop_ism_irq(0, (void *) ADB_IOP);
}
int adb_iop_reset_bus(void)