From: Ionut Nicu Date: Fri, 11 Oct 2013 12:17:10 +0000 (+0200) Subject: i2c: mux: gpio: use gpio_set_value_cansleep() X-Git-Tag: next-20131105~75^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=250ad590d6f12d93f4d85be305b0a598d609232e;p=karo-tx-linux.git i2c: mux: gpio: use gpio_set_value_cansleep() 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 Acked-by: Peter Korsgaard Signed-off-by: Wolfram Sang Cc: stable@kernel.org --- diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 927a7deafd21..cf93f10b59af 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -30,8 +30,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)