diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2005-11-05 10:16:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-05 10:16:50 +0000 |
| commit | 25cc5e5bd20e9274dddb9d1e55b83798363528dc (patch) | |
| tree | fd065b54bbce7e04387670e163d2aba1ddf43ace /drivers/mmc | |
| parent | 34cf9e37507c65f7398df4c21a18d4a3e83881d7 (diff) | |
| download | linux-3.10-25cc5e5bd20e9274dddb9d1e55b83798363528dc.tar.gz linux-3.10-25cc5e5bd20e9274dddb9d1e55b83798363528dc.tar.bz2 linux-3.10-25cc5e5bd20e9274dddb9d1e55b83798363528dc.zip | |
[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>
Diffstat (limited to 'drivers/mmc')
| -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 942668e93a7..ea0c4b3361b 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, /* * See if chip needs to be configured. */ - if (pnp && (host->config != 0)) + if (pnp) { - if (!wbsd_chip_validate(host)) + if ((host->config != 0) && !wbsd_chip_validate(host)) { printk(KERN_WARNING DRIVER_NAME ": PnP active but chip not configured! " |