[PATCH 3.11 091/272] i2c: mux: gpio: use gpio_set_value_cansleep()
Luis Henriques
luis.henriques at canonical.com
Fri Dec 6 12:56:20 UTC 2013
3.11.10.1 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Ionut Nicu <ioan.nicu.ext at nsn.com>
commit 250ad590d6f12d93f4d85be305b0a598d609232e upstream.
Some gpio chips may have get/set operations that
can sleep. gpio_set_value() only works for chips
which do not sleep, for the others we will get a
kernel warning. Using gpio_set_value_cansleep()
will work for both chips that do sleep and those
who don't.
Signed-off-by: Ionut Nicu <ioan.nicu.ext at nsn.com>
Acked-by: Peter Korsgaard <peter.korsgaard at barco.com>
Signed-off-by: Wolfram Sang <wsa at the-dreams.de>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/i2c/muxes/i2c-mux-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 4879796..bb4f69f 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -31,8 +31,8 @@ static void i2c_mux_gpio_set(const struct gpiomux *mux, unsigned val)
int i;
for (i = 0; i < mux->data.n_gpios; i++)
- gpio_set_value(mux->gpio_base + mux->data.gpios[i],
- val & (1 << i));
+ gpio_set_value_cansleep(mux->gpio_base + mux->data.gpios[i],
+ val & (1 << i));
}
static int i2c_mux_gpio_select(struct i2c_adapter *adap, void *data, u32 chan)
--
1.8.3.2
More information about the kernel-team
mailing list