diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /drivers/net/ax88796.c | |
| parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
| parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'drivers/net/ax88796.c')
| -rw-r--r-- | drivers/net/ax88796.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 62d9c9cc5671..1dd4403247ca 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
| @@ -921,7 +921,7 @@ static int ax_probe(struct platform_device *pdev) | |||
| 921 | size = (res->end - res->start) + 1; | 921 | size = (res->end - res->start) + 1; |
| 922 | 922 | ||
| 923 | ax->mem2 = request_mem_region(res->start, size, pdev->name); | 923 | ax->mem2 = request_mem_region(res->start, size, pdev->name); |
| 924 | if (ax->mem == NULL) { | 924 | if (ax->mem2 == NULL) { |
| 925 | dev_err(&pdev->dev, "cannot reserve registers\n"); | 925 | dev_err(&pdev->dev, "cannot reserve registers\n"); |
| 926 | ret = -ENXIO; | 926 | ret = -ENXIO; |
| 927 | goto exit_mem1; | 927 | goto exit_mem1; |