diff --git a/[refs] b/[refs]
index c93c17b9a631..1b7b18f6f6c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc6835a41aea115d97a74d67dc95faa0bbc63d5f
+refs/heads/master: 273a4b8a58840773730e0134fe1af11d399cb7a0
diff --git a/trunk/drivers/tty/serial/max310x.c b/trunk/drivers/tty/serial/max310x.c
index 3bb809d083aa..a801f6872cad 100644
--- a/trunk/drivers/tty/serial/max310x.c
+++ b/trunk/drivers/tty/serial/max310x.c
@@ -1178,6 +1178,7 @@ static int max310x_probe(struct spi_device *spi)
 		s->gpio.set		= max310x_gpio_set;
 		s->gpio.base		= pdata->gpio_base;
 		s->gpio.ngpio		= s->nr_gpio;
+		s->gpio.can_sleep	= 1;
 		if (gpiochip_add(&s->gpio)) {
 			/* Indicate that we should not call gpiochip_remove */
 			s->gpio.base = 0;