diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-17 21:19:25 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-17 21:19:25 -0500 |
| commit | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (patch) | |
| tree | c25f19a0ae1f7cb75319b585c1d473cfed463f22 /drivers/atm | |
| parent | 8d30c14cab30d405a05f2aaceda1e9ad57800f36 (diff) | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h
Diffstat (limited to 'drivers/atm')
| -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 | ||