diff options
author | Maciej W. Rozycki <macro@linux-mips.org> | 2007-05-29 11:12:22 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-30 09:52:48 -0400 |
commit | 8a32352661cc8e942897d205ba18f871ef7be597 (patch) | |
tree | 45b454ff1dd0ce3e866eb53b5222bf3725e93632 | |
parent | 34dd962b748bdb4f96fc5e6e69dc66522924f489 (diff) |
defxx: Fix the handling of ioremap() failures
If ioremap_nocache() is unfortunate enough to fail, the error code is not
set correctly leading to a false success from dfx_register(). This change
fixes the problem.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/defxx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c index 571d82f8008c..7df23dc28190 100644 --- a/drivers/net/defxx.c +++ b/drivers/net/defxx.c | |||
@@ -566,6 +566,7 @@ static int __devinit dfx_register(struct device *bdev) | |||
566 | bp->base.mem = ioremap_nocache(bar_start, bar_len); | 566 | bp->base.mem = ioremap_nocache(bar_start, bar_len); |
567 | if (!bp->base.mem) { | 567 | if (!bp->base.mem) { |
568 | printk(KERN_ERR "%s: Cannot map MMIO\n", print_name); | 568 | printk(KERN_ERR "%s: Cannot map MMIO\n", print_name); |
569 | err = -ENOMEM; | ||
569 | goto err_out_region; | 570 | goto err_out_region; |
570 | } | 571 | } |
571 | } else { | 572 | } else { |