[patch 1/1] telephony ixc missing return check for request_region()

From: Laurent Wandrebeck
Date: Fri Mar 17 2006 - 08:08:28 EST


Hi,
in drivers/telephony/ixj.c, request_region() is called without checking the return
value. Here is a simple patch to fix it.
Patch against 2.6.16-rc6-git8.
Please CC me on replies.
Regards.

Signed-off-by: Laurent Wandrebeck <l.wandrebeck@xxxxxxx>

--- linux-2.6.16-rc6/drivers/telephony/ixj.c.ori 2006-03-11 23:12:55.000000000 +0100
+++ linux-2.6.16-rc6/drivers/telephony/ixj.c 2006-03-17 14:10:32.000000000 +0100
@@ -6802,7 +6802,10 @@ static int ixj_selfprobe(IXJ *j)
}
} else if (j->dsp.low == 0x22) {
j->cardtype = QTI_PHONEJACK_PCI;
- request_region(j->XILINXbase, 4, "ixj control");
+ if (!request_region(j->XILINXbase, 4, "ixj control")) {
+ printk(KERN_INFO "ixj: can't get I/O address 0x%x\n", j->XILINXbase);
+ return -1;
+ }
j->pld_slicw.pcib.e1 = 1;
outb_p(j->pld_slicw.byte, j->XILINXbase);
} else

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/