diff options
Diffstat (limited to 'drivers/mmc/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 8a30ef3ae419..c351c6d1a18a 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include "wbsd.h" | 41 | #include "wbsd.h" |
| 42 | 42 | ||
| 43 | #define DRIVER_NAME "wbsd" | 43 | #define DRIVER_NAME "wbsd" |
| 44 | #define DRIVER_VERSION "1.5" | 44 | #define DRIVER_VERSION "1.6" |
| 45 | 45 | ||
| 46 | #define DBG(x...) \ | 46 | #define DBG(x...) \ |
| 47 | pr_debug(DRIVER_NAME ": " x) | 47 | pr_debug(DRIVER_NAME ": " x) |
| @@ -1439,13 +1439,13 @@ static int __devinit wbsd_scan(struct wbsd_host *host) | |||
| 1439 | 1439 | ||
| 1440 | static int __devinit wbsd_request_region(struct wbsd_host *host, int base) | 1440 | static int __devinit wbsd_request_region(struct wbsd_host *host, int base) |
| 1441 | { | 1441 | { |
| 1442 | if (io & 0x7) | 1442 | if (base & 0x7) |
| 1443 | return -EINVAL; | 1443 | return -EINVAL; |
| 1444 | 1444 | ||
| 1445 | if (!request_region(base, 8, DRIVER_NAME)) | 1445 | if (!request_region(base, 8, DRIVER_NAME)) |
| 1446 | return -EIO; | 1446 | return -EIO; |
| 1447 | 1447 | ||
| 1448 | host->base = io; | 1448 | host->base = base; |
| 1449 | 1449 | ||
| 1450 | return 0; | 1450 | return 0; |
| 1451 | } | 1451 | } |
| @@ -1773,7 +1773,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, | |||
| 1773 | /* | 1773 | /* |
| 1774 | * Request resources. | 1774 | * Request resources. |
| 1775 | */ | 1775 | */ |
| 1776 | ret = wbsd_request_resources(host, io, irq, dma); | 1776 | ret = wbsd_request_resources(host, base, irq, dma); |
| 1777 | if (ret) { | 1777 | if (ret) { |
| 1778 | wbsd_release_resources(host); | 1778 | wbsd_release_resources(host); |
| 1779 | wbsd_free_mmc(dev); | 1779 | wbsd_free_mmc(dev); |
| @@ -1861,6 +1861,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp) | |||
| 1861 | 1861 | ||
| 1862 | static int __devinit wbsd_probe(struct platform_device *dev) | 1862 | static int __devinit wbsd_probe(struct platform_device *dev) |
| 1863 | { | 1863 | { |
| 1864 | /* Use the module parameters for resources */ | ||
| 1864 | return wbsd_init(&dev->dev, io, irq, dma, 0); | 1865 | return wbsd_init(&dev->dev, io, irq, dma, 0); |
| 1865 | } | 1866 | } |
| 1866 | 1867 | ||
