From e4c64c6e5e660c31255437d93b5f804c7a4cbc1d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 17 Feb 2012 10:46:00 -0800 Subject: [PATCH] --- yaml --- r: 296913 b: refs/heads/master c: e4e449e82871c53ef3b22bd3a50fceabc0638926 h: refs/heads/master i: 296911: dcfd5ecd283e20db538bc306b2c56f1a4f064c75 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpiolib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 272980156da7..423498e967a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25553ff0756c59b617af6bdd280c94e943164184 +refs/heads/master: e4e449e82871c53ef3b22bd3a50fceabc0638926 diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c index 58f40dfc5265..5a75510d66bb 100644 --- a/trunk/drivers/gpio/gpiolib.c +++ b/trunk/drivers/gpio/gpiolib.c @@ -1581,6 +1581,7 @@ int __gpio_get_value(unsigned gpio) int value; chip = gpio_to_chip(gpio); + /* Should be using gpio_get_value_cansleep() */ WARN_ON(chip->can_sleep); value = chip->get ? chip->get(chip, gpio - chip->base) : 0; trace_gpio_value(gpio, 1, value); @@ -1653,6 +1654,7 @@ void __gpio_set_value(unsigned gpio, int value) struct gpio_chip *chip; chip = gpio_to_chip(gpio); + /* Should be using gpio_set_value_cansleep() */ WARN_ON(chip->can_sleep); trace_gpio_value(gpio, 0, value); if (test_bit(FLAG_OPEN_DRAIN, &gpio_desc[gpio].flags))