aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeelis Roos <mroos@linux.ee>2009-02-10 17:19:19 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-16 17:52:52 -0700
commitf5ab9014ca6ba959929e5533875f0a61fd6afb29 (patch)
tree7adec99c7964852d17793e6b6fea31dcdda24959
parent44b576776241240f03fcf5981fc7d16f3a927b5b (diff)
fore200: fix oops on failed firmware load
commit fcffd0d8bbddac757cd856e635ac75e8eb4518bc upstream. Fore 200 ATM driver fails to handle request_firmware failures and oopses when no firmware file was found. Fix it by checking for the right return values and propaganting the return value up. Signed-off-by: Meelis Roos <mroos@linux.ee> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/atm/fore200e.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 73338d231db..31c18f44f00 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2578,8 +2578,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
return err;
sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT);
- if (request_firmware(&firmware, buf, device) == 1) {
- printk(FORE200E "missing %s firmware image\n", fore200e->bus->model_name);
+ if ((err = request_firmware(&firmware, buf, device)) < 0) {
+ printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name);
return err;
}