Messages in this thread Patch in this message | | | Date | Sun, 7 Dec 2003 21:49:39 +0100 | From | Geert Uytterhoeven <> | Subject | [PATCH 127] Mac ADB IOP fix |
| |
Mac ADB IOP: Fix improperly initialized request struct in the reset code, causing a bogus pointer (from Matthias Urlichs in 2.6.0)
--- linux-2.4.23/drivers/macintosh/adb-iop.c Wed Feb 16 07:39:01 2000 +++ linux-m68k-2.4.23/drivers/macintosh/adb-iop.c Mon Oct 20 21:45:29 2003 @@ -106,6 +106,9 @@ struct adb_iopmsg *amsg = (struct adb_iopmsg *) msg->message; struct adb_request *req; uint flags; +#ifdef DEBUG_ADB_IOP + int i; +#endif save_flags(flags); cli(); @@ -113,12 +116,10 @@ req = current_req; #ifdef DEBUG_ADB_IOP - printk("adb_iop_listen: rcvd packet, %d bytes: %02X %02X", + printk("adb_iop_listen %p: rcvd packet, %d bytes: %02X %02X", req, (uint) amsg->count + 2, (uint) amsg->flags, (uint) amsg->cmd); - i = 0; - while (i < amsg->count) { - printk(" %02X", (uint) amsg->data[i++]); - } + for (i = 0; i < amsg->count; i++) + printk(" %02X", (uint) amsg->data[i]); printk("\n"); #endif @@ -136,7 +137,7 @@ adb_iop_end_req(req, idle); } } else { - /* TODO: is it possible for more tha one chunk of data */ + /* TODO: is it possible for more than one chunk of data */ /* to arrive before the timeout? If so we need to */ /* use reply_ptr here like the other drivers do. */ if ((adb_iop_state == awaiting_reply) && @@ -165,6 +166,9 @@ unsigned long flags; struct adb_request *req; struct adb_iopmsg amsg; +#ifdef DEBUG_ADB_IOP + int i; +#endif /* get the packet to send */ req = current_req; @@ -174,7 +178,7 @@ cli(); #ifdef DEBUG_ADB_IOP - printk("adb_iop_start: sending packet, %d bytes:", req->nbytes); + printk("adb_iop_start %p: sending packet, %d bytes:", req, req->nbytes); for (i = 0 ; i < req->nbytes ; i++) printk(" %02X", (uint) req->data[i]); printk("\n"); @@ -271,13 +275,17 @@ int adb_iop_reset_bus(void) { - struct adb_request req; + struct adb_request req = { + .reply_expected = 0, + .nbytes = 2, + .data = { ADB_PACKET, 0 }, + }; - req.reply_expected = 0; - req.nbytes = 2; - req.data[0] = ADB_PACKET; - req.data[1] = 0; /* RESET */ adb_iop_write(&req); - while (!req.complete) adb_iop_poll(); + while (!req.complete) { + adb_iop_poll(); + schedule(); + } + return 0; } Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |