Commit 25cc5e5b authored by Pierre Ossman's avatar Pierre Ossman Committed by Russell King

[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: default avatarPierre Ossman <drzeus@drzeus.cx>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 34cf9e37
...@@ -1852,9 +1852,9 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma, ...@@ -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. * 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 printk(KERN_WARNING DRIVER_NAME
": PnP active but chip not configured! " ": PnP active but chip not configured! "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment