[packages/kernel] - Added a patch, which allows SD card readers like SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO

[lmasko]

commit 8a73b8356c8f39b069959df5fa85da650747c675
Author: Lukasz Masko <lmasko at pld-linux.org>
Date:   Tue Feb 12 20:25:21 2013 +0100

    - Added a patch, which allows SD card readers like SD Host controller:
      Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 18)
      to work again
      (taken from http://thread.gmane.org/gmane.linux.kernel.mmc/17643).

 kernel-small_fixes.patch | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
---
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 788ac81..dea54c0 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -666,3 +666,36 @@ index 205af8d..22436f7 100644
 1.7.6.5
 
 
+diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
+index 042c1ff..d07c240 100644
+--- a/drivers/regulator/core.c
++++ b/drivers/regulator/core.c
+@@ -1872,7 +1872,14 @@ int regulator_count_voltages(struct regulator *regulator)
+ {
+ 	struct regulator_dev	*rdev = regulator->rdev;
+
+-	return rdev->desc->n_voltages ? : -EINVAL;
++	if (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE) {
++		if (rdev->desc->n_voltages)
++			return rdev->desc->n_voltages;
++		else
++			return -EINVAL;
++	} else {
++		return 1;
++	}
+ }
+ EXPORT_SYMBOL_GPL(regulator_count_voltages);
+
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index c7851c0..6f6534e 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -2923,7 +2923,7 @@ int sdhci_add_host(struct sdhci_host *host)
+ 		regulator_enable(host->vmmc);
+
+ #ifdef CONFIG_REGULATOR
+-	if (host->vmmc) {
++	if (host->vmmc && regulator_count_voltages(host->vmmc) > 1) {
+ 		ret = regulator_is_supported_voltage(host->vmmc, 3300000,
+ 			3300000);
+ 		if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330)))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/8a73b8356c8f39b069959df5fa85da650747c675