lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: handle signal reception while waiting for POST

Browse Source 
If waiting on POST returns prematurely (due to a signal), abort polling and return an error.

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla
2011-05-12 19:32:15 +00:00
committed by David S. Miller
parent 29dd54b72b
commit 6ed35eea3b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/benet/be_cmds.c
View File

@@ -376,23 +376,25 @@ int be_cmd_POST(struct be_adapter *adapter)
{ {
u16 stage; u16 stage;
int status, timeout = 0; int status, timeout = 0;
struct device *dev = &adapter->pdev->dev;
do { do {
status = be_POST_stage_get(adapter, &stage); status = be_POST_stage_get(adapter, &stage);
if (status) { if (status) {
dev_err(&adapter->pdev->dev, "POST error; stage=0x%x\n", dev_err(dev, "POST error; stage=0x%x\n", stage);
stage);
return -1; return -1;
} else if (stage != POST_STAGE_ARMFW_RDY) { } else if (stage != POST_STAGE_ARMFW_RDY) {
set_current_state(TASK_INTERRUPTIBLE); if (msleep_interruptible(2000)) {
schedule_timeout(2 * HZ); dev_err(dev, "Waiting for POST aborted\n");
return -EINTR;
}
timeout += 2; timeout += 2;
} else { } else {
return 0; return 0;
} }
} while (timeout < 40); } while (timeout < 40);
dev_err(&adapter->pdev->dev, "POST timeout; stage=0x%x\n", stage); dev_err(dev, "POST timeout; stage=0x%x\n", stage);
return -1; return -1;
} }