diff --git a/[refs] b/[refs] index f98567991651..b79a458f23cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ba1821d1b4a506f8c9be93d962f22b24b6140a5 +refs/heads/master: 364fadb32b67695cec610f5cd03df2514ef0f2b0 diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c index 8a29404985f1..21da9c19a0cb 100644 --- a/trunk/drivers/gpio/gpiolib.c +++ b/trunk/drivers/gpio/gpiolib.c @@ -386,9 +386,9 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, } } - ret = request_irq(irq, gpio_sysfs_irq, irq_flags, + ret = request_any_context_irq(irq, gpio_sysfs_irq, irq_flags, "gpiolib", value_sd); - if (ret) + if (ret < 0) goto free_id; desc->flags |= gpio_flags;