[PATCH] [MMC] Change SDHCI version error to a warning

[PATCH] [MMC] Change SDHCI version error to a warning

[Pierre Ossman]

O2 Micro's controllers have a larger specification version value and are
therefore denied by the driver. When bypassing this check they seem to work
fine. This patch makes the code a bit more forgiving by changing the
warning to an error.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

 drivers/mmc/sdhci.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index fd34d84..9ec4200 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1193,10 +1193,8 @@ static int __devinit sdhci_probe_slot(st
 	version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;
 	if (version != 0) {
 		printk(KERN_ERR "%s: Unknown controller version (%d). "
-			"Cowardly refusing to continue.\n", host->slot_descr,
+			"You may experience problems.\n", host->slot_descr,
 			version);
-		ret = -ENODEV;
-		goto unmap;
 	}
 
 	caps = readl(host->ioaddr + SDHCI_CAPABILITIES);

Re: [PATCH] [MMC] Change SDHCI version error to a warning

[Russell King]

On Tue, Jul 11, 2006 at 09:07:10PM +0200, Pierre Ossman wrote:
> O2 Micro's controllers have a larger specification version value and are
> therefore denied by the driver. When bypassing this check they seem to work
> fine. This patch makes the code a bit more forgiving by changing the
> warning to an error.

Doesn't this patch change the error to a warning instead?

> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
> ---
> 
>  drivers/mmc/sdhci.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index fd34d84..9ec4200 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -1193,10 +1193,8 @@ static int __devinit sdhci_probe_slot(st
>  	version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;
>  	if (version != 0) {
>  		printk(KERN_ERR "%s: Unknown controller version (%d). "
> -			"Cowardly refusing to continue.\n", host->slot_descr,
> +			"You may experience problems.\n", host->slot_descr,
>  			version);
> -		ret = -ENODEV;
> -		goto unmap;
>  	}
>  
>  	caps = readl(host->ioaddr + SDHCI_CAPABILITIES);

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [PATCH] [MMC] Change SDHCI version error to a warning

[Pierre Ossman]

Russell King wrote:
> On Tue, Jul 11, 2006 at 09:07:10PM +0200, Pierre Ossman wrote:
>> O2 Micro's controllers have a larger specification version value and are
>> therefore denied by the driver. When bypassing this check they seem to work
>> fine. This patch makes the code a bit more forgiving by changing the
>> warning to an error.
> 
> Doesn't this patch change the error to a warning instead?

*doh*

Must have been late when I wrote the commit message. It should of course
be a change from an error to a warning in order to just nag users
instead of completely blocking them.

Rgds
Pierre