Add a return value to a return statement in the ISR and remove/rename
several labels.
--
Open Source Development Lab Phone: 503.626.2455 Ext. 17
diff -Nru a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
--- a/drivers/char/rio/rio_linux.c Fri Jun 20 13:57:08 2003
rio_reset_interrupt (HostP);
}
- if ((HostP->Flags & RUN_STATE) != RC_RUNNING) return;
+ if ((HostP->Flags & RUN_STATE) != RC_RUNNING) return IRQ_NONE;
if (test_and_set_bit (RIO_BOARD_INTR_LOCK, &HostP->locks)) {
for (i = 0; i < RIO_PORTS; i++) {
port = p->RIOPortp[i] = ckmalloc (sizeof (struct Port));
if (!port) {
- goto free6;
+ goto free3;
}
rio_dprintk (RIO_DEBUG_INIT, "initing port %d (%d)\n", i, port->Mapped);
func_exit();
return 0;
- free6:for (i--;i>=0;i--)
+ free3:for (i--;i>=0;i--)
kfree (p->RIOPortp[i]);
-/*free5: */
- free4:
- free3:kfree (p->RIOPortp);
+ kfree (p->RIOPortp);
free2:kfree (p->RIOHosts);
free1:
rio_dprintk (RIO_DEBUG_INIT, "Not enough memory! %p %p %p\n",
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/