summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIonut Nicu <ioan.nicu.ext@nsn.com>2013-10-11 14:17:10 +0200
committerWolfram Sang <wsa@the-dreams.de>2013-10-30 17:29:40 +0100
commit250ad590d6f12d93f4d85be305b0a598d609232e (patch)
treee3e4f24fd0c45381dbe8dedcd5a7963d2c132828
parent4edd65e63fe4a998164a8d7d8c8c86f4300825d7 (diff)
downloadlinux-stable-250ad590d6f12d93f4d85be305b0a598d609232e.tar.gz
linux-stable-250ad590d6f12d93f4d85be305b0a598d609232e.tar.bz2
linux-stable-250ad590d6f12d93f4d85be305b0a598d609232e.zip
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 <ioan.nicu.ext@nsn.com> Acked-by: Peter Korsgaard <peter.korsgaard@barco.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Cc: stable@kernel.org
-rw-r--r--drivers/i2c/muxes/i2c-mux-gpio.c4
1 files changed, 2 insertions, 2 deletions
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)