[patch] portman2x4.c: fix boot hang

Ingo Molnar
2007-10-24T19:44:36Z

Subject: portman2x4.c: fix boot hang
From: Ingo Molnar <mingo@elte.hu>

when booting an allyesconfig bzImage kernel the bootup hangs in the
portman2x4 driver (on a box that does not have this hardware), at:

Pid: 1, comm: swapper
EIP: 0060:[<c02f763c>] CPU: 0
EIP is at parport_pc_read_status+0x4/0x8
EFLAGS: 00000202 Not tainted (2.6.23-rc9 #904)
EAX: f7e57a7f EBX: 00000010 ECX: c2b808c0 EDX: 00000379
ESI: f7cb8230 EDI: 00000010 EBP: f7cb8230 DS: 007b ES: 007b FS: 0000
CR0: 8005003b CR2: fff9c000 CR3: 007ec000 CR4: 00000690
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
[<c04613de>] portman_flush_input+0xde/0x12c
[<c0461a24>] snd_portman_probe+0x368/0x484
[<c02fbb8c>] __device_attach+0x0/0x8
[<c02fce68>] platform_drv_probe+0xc/0x10
[<c02fba6c>] driver_probe_device+0x74/0x194
[<c0587174>] klist_next+0x38/0x70
[<c02fbb8c>] __device_attach+0x0/0x8
[<c02faea1>] bus_for_each_drv+0x35/0x68
[<c02fbc22>] device_attach+0x72/0x78

the reason is due to an inconsistent error return code of 1 or 2, while
snd_portman_probe only realizes negative error codes.

with this fixed the probe fails as it should and the bootup continues.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
sound/drivers/portman2x4.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux/sound/drivers/portman2x4.c
===================================================================
--- linux.orig/sound/drivers/portman2x4.c
+++ linux/sound/drivers/portman2x4.c
@@ -467,7 +467,7 @@ static int portman_probe(struct parport
/* Check for ESTB to be clear */
/* 4 */
if ((parport_read_status(p) & ESTB) == ESTB)
- return 1; /* CODE 1 - Strobe Failure. */
+ return -EIO; /* CODE 1 - Strobe Failure. */

/* Set for RXDATA0 where no damage will be done. */
/* 5 */
@@ -475,7 +475,7 @@ static int portman_probe(struct parport

/* 6 */
if ((parport_read_status(p) & ESTB) != ESTB)
- return 1; /* CODE 1 - Strobe Failure. */
+ return -EIO; /* CODE 1 - Strobe Failure. */

/* 7 */
parport_write_control(p, 0); /* Reset Strobe=0. */
@@ -491,7 +491,7 @@ static int portman_probe(struct parport
*/
/* 9 */
if ((parport_read_status(p) & TXEMPTY) == 0)
- return 2;
+ return -EIO;

/* Return OK status. */
return 0;