From: Geert Uytterhoeven <geert@linux-m68k.org>
Mac ADB IOP: Fix improperly initialized request struct in the reset code,
causing a bogus pointer (from Matthias Urlichs)
---
25-akpm/drivers/macintosh/adb-iop.c | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff -puN drivers/macintosh/adb-iop.c~68k-355 drivers/macintosh/adb-iop.c
--- 25/drivers/macintosh/adb-iop.c~68k-355 Thu Jan 8 15:37:35 2004
+++ 25-akpm/drivers/macintosh/adb-iop.c Thu Jan 8 15:37:35 2004
@@ -105,18 +105,19 @@ static void adb_iop_listen(struct iop_ms
struct adb_iopmsg *amsg = (struct adb_iopmsg *) msg->message;
struct adb_request *req;
uint flags;
+#ifdef DEBUG_ADB_IOP
+ int i;
+#endif
local_irq_save(flags);
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
@@ -134,7 +135,7 @@ static void adb_iop_listen(struct iop_ms
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) &&
@@ -163,6 +164,9 @@ static void adb_iop_start(void)
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;
@@ -171,7 +175,7 @@ static void adb_iop_start(void)
local_irq_save(flags);
#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");
@@ -267,13 +271,17 @@ void adb_iop_poll(void)
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;
}
_