Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 25cc5e5bd20e9274dddb9d1e55b83798363528dc

Authored by Pierre Ossman
Committed by Russell King
1 parent 34cf9e3750
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1852,9 +1852,9 @@
1852 1852 /*
1853 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 1859 printk(KERN_WARNING DRIVER_NAME
1860 1860 ": PnP active but chip not configured! "