From: Pierre Ossman Date: Sat, 5 Nov 2005 10:16:50 +0000 (+0000) Subject: [MMC] Fix chip config in wbsd X-Git-Tag: v2.6.15-rc1~724^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=25cc5e5bd20e9274dddb9d1e55b83798363528dc;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Russell King --- 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! "