Prev: mfd: menelaus: Use macros instead of some constant magic numbers
Next: [PATCH] hrtimer: make epoll_wait() use the hrtimer range feature
From: Samuel Ortiz on 8 Aug 2010 18:00
Hi Jarkko,

On Sun, Aug 08, 2010 at 08:05:23PM +0300, Jarkko Nikula wrote:
> We are modifying register value instead of return value.
Patch applied, kiitos.


> This fix is originally done by Carlos Eduardo Aguiar. Original fix is
> commit bb4e91722e29efe31587d2cc664b6def645aecd9 in
> git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
>
> Author modified the fix for mainline version of menelaus.
>
> Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com>
> Cc: Carlos Eduardo Aguiar <carlos.aguiar(a)indt.org.br>
> ---
> Tested on N810. Integrated eMMC on N810 started to work with this patch.
> ---
> drivers/mfd/menelaus.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
> index a3fb4bc..e02b574 100644
> --- a/drivers/mfd/menelaus.c
> +++ b/drivers/mfd/menelaus.c
> @@ -356,9 +356,9 @@ int menelaus_set_mmc_slot(int slot, int enable, int power, int cd_en)
> int b;
>
> if (enable)
> - ret |= 1 << 1;
> + val |= 1 << 1;
> else
> - ret &= ~(1 << 1);
> + val &= ~(1 << 1);
> b = menelaus_read_reg(MENELAUS_MCT_CTRL2);
> b &= ~0x03;
> b |= power;
> --
> 1.7.1
>

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Tony Lindgren on 9 Aug 2010 03:40
* Jarkko Nikula <jhnikula(a)gmail.com> [100808 19:57]:
>
> Tested on N810. Integrated eMMC on N810 started to work with this patch.

Ah great, good to hear! I've been wondering for a while how come only
the external MMC worked.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: mfd: menelaus: Use macros instead of some constant magic numbers
Next: [PATCH] hrtimer: make epoll_wait() use the hrtimer range feature