diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2005-11-05 05:16:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-05 05:16:50 -0500 |
commit | 25cc5e5bd20e9274dddb9d1e55b83798363528dc (patch) | |
tree | fd065b54bbce7e04387670e163d2aba1ddf43ace | |
parent | 34cf9e37507c65f7398df4c21a18d4a3e83881d7 (diff) |
[MMC] Fix chip config in wbsd
There is a broken if clause in the wbsd driver that can cause the
driver to try and configure the chip even though none is found. This
results in i/o on invalid ports.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/mmc/wbsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 942668e93a74..ea0c4b3361bf 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
@@ -1852,9 +1852,9 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma, | |||
1852 | /* | 1852 | /* |
1853 | * See if chip needs to be configured. | 1853 | * See if chip needs to be configured. |
1854 | */ | 1854 | */ |
1855 | if (pnp && (host->config != 0)) | 1855 | if (pnp) |
1856 | { | 1856 | { |
1857 | if (!wbsd_chip_validate(host)) | 1857 | if ((host->config != 0) && !wbsd_chip_validate(host)) |
1858 | { | 1858 | { |
1859 | printk(KERN_WARNING DRIVER_NAME | 1859 | printk(KERN_WARNING DRIVER_NAME |
1860 | ": PnP active but chip not configured! " | 1860 | ": PnP active but chip not configured! " |