diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/atm/fore200e.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'drivers/atm/fore200e.c')
| -rw-r--r-- | drivers/atm/fore200e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 937c9c0ef4c9..10f000dbe448 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c | |||
| @@ -2519,8 +2519,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) | |||
| 2519 | return err; | 2519 | return err; |
| 2520 | 2520 | ||
| 2521 | sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT); | 2521 | sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT); |
| 2522 | if (request_firmware(&firmware, buf, device) == 1) { | 2522 | if ((err = request_firmware(&firmware, buf, device)) < 0) { |
| 2523 | printk(FORE200E "missing %s firmware image\n", fore200e->bus->model_name); | 2523 | printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name); |
| 2524 | return err; | 2524 | return err; |
| 2525 | } | 2525 | } |
| 2526 | 2526 | ||