Messages in this thread | | | Date | Fri, 2 Jan 2004 22:47:45 +0100 (MET) | From | Geert Uytterhoeven <> | Subject | Re: [PATCH 355] Mac ADB IOP fix |
| |
On Fri, 2 Jan 2004, Stan Bubrouski wrote: > On Thu, 2004-01-01 at 15:01, Geert Uytterhoeven wrote: > > Mac ADB IOP: Fix improperly initialized request struct in the reset code, > > causing a bogus pointer (from Matthias Urlichs) > > > > --- linux-2.6.0/drivers/macintosh/adb-iop.c Thu Jan 2 12:54:27 2003 > > +++ linux-m68k-2.6.0/drivers/macintosh/adb-iop.c Mon Oct 20 21:45:56 2003 > > @@ -105,18 +105,19 @@ > > struct adb_iopmsg *amsg = (struct adb_iopmsg *) msg->message; > > struct adb_request *req; > > uint flags; > > +#ifdef DEBUG_ADB_IOP > > + int i; > > +#endif > > > > Why not move this down into the ifdef below? 2 extra lines aren't > needed.
Because you can't mix variable declarations with statements in `old' C. The alternative is to add curly braces below, but that's more lines too.
> -sb > > > 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 > >
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/
| |