* Carlos Aguiar <carlos.aguiar@xxxxxxxxxxx> [080125 10:39]: > From: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> > > This patch corrects MMC slot 2 misconfiguration on menelaus code. > > Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> > Acked-by: Eduardo Valentin <eduardo.valentin@xxxxxxxxxxx> > --- > drivers/i2c/chips/menelaus.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c > index 9d75964..77b3342 100644 > --- a/drivers/i2c/chips/menelaus.c > +++ b/drivers/i2c/chips/menelaus.c > @@ -357,9 +357,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; Pushing today. Tony - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html