OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parport_pc: Fix subscription bugs 

This patch fixes array subscription bugs in the parport_pc driver.

drivers/parport/parport_pc.c: In function ‘parport_irq_probe’:
drivers/parport/parport_pc.c:1589: warning: array subscript is above array bounds
drivers/parport/parport_pc.c: In function ‘parport_pc_probe_port’:
drivers/parport/parport_pc.c:1579: warning: array subscript is above array bounds

The patch also fixes a few other array bugs, which the compiler was
unable to find. Coding style violations are also fixed.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michael Buesch 2009-06-11 13:06:31 +01:00 committed by Linus Torvalds
parent 0b4068a128
commit 73e0d48b8c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/parport/parport_pc.c
View File

@ -1246,17 +1246,17 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
(cr1 & 0x08 ) ? "Standard mode only (SPP)" : modes[cr4 & 0x03],
(cr4 & 0x40) ? "1.7" : "1.9");
}
/* Heuristics ! BIOS setup for this mainboard device limits
the choices to standard settings, i.e. io-address and IRQ
are related, however DMA can be 1 or 3, assume DMA_A=DMA1,
DMA_C=DMA3 (this is true e.g. for TYAN 1564D Tomcat IV) */
if(cr23*4 >=0x100) { /* if active */
while((superios[i].io!= 0) && (i<NR_SUPERIOS))
if (cr23 * 4 >= 0x100) { /* if active */
while ((i < NR_SUPERIOS) && (superios[i].io != 0))
i++;
if(i==NR_SUPERIOS)
if (i == NR_SUPERIOS) {
printk(KERN_INFO "Super-IO: too many chips!\n");
else {
} else {
int d;
switch (cr23*4) {
case 0x3bc:
@ -1332,12 +1332,12 @@ static void __devinit show_parconfig_winbond(int io, int key)
printk(KERN_INFO "Winbond LPT Config: Port mode=%s\n", modes[crf0 & 0x07]);
}
if(cr30 & 0x01) { /* the settings can be interrogated later ... */
while((superios[i].io!= 0) && (i<NR_SUPERIOS))
if (cr30 & 0x01) { /* the settings can be interrogated later ... */
while ((i < NR_SUPERIOS) && (superios[i].io != 0))
i++;
if(i==NR_SUPERIOS)
if (i == NR_SUPERIOS) {
printk(KERN_INFO "Super-IO: too many chips!\n");
else {
} else {
superios[i].io = (cr60<<8)|cr61;
superios[i].irq = cr70&0x0f;
superios[i].dma = (((cr74 & 0x07) > 3) ?
@ -1575,24 +1575,26 @@ static void __devinit detect_and_report_it87(void)
static int get_superio_dma (struct parport *p)
{
int i=0;
while( (superios[i].io != p->base) && (i<NR_SUPERIOS))
int i = 0;
while ((i < NR_SUPERIOS) && (superios[i].io != p->base))
i++;
if (i!=NR_SUPERIOS)
if (i != NR_SUPERIOS)
return superios[i].dma;
return PARPORT_DMA_NONE;
}
static int get_superio_irq (struct parport *p)
{
int i=0;
while( (superios[i].io != p->base) && (i<NR_SUPERIOS))
int i = 0;
while ((i < NR_SUPERIOS) && (superios[i].io != p->base))
i++;
if (i!=NR_SUPERIOS)
if (i != NR_SUPERIOS)
return superios[i].irq;
return PARPORT_IRQ_NONE;
}
/* --- Mode detection ------------------------------------- */