summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorMichal Vokáč <michal.vokac@ysoft.com>2018-10-08 13:57:36 +0300
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-10-08 13:57:36 +0300
commit7d1b8d7a858024bd6a1dca206646fbcab5785220 (patch)
treed55486adb10ea1ca2c9dfd66a937dab4954284d7 /drivers/video
parentaae3394ef0ef90cf00a21133357448385f13a5d4 (diff)
downloadlinux-7d1b8d7a858024bd6a1dca206646fbcab5785220.tar.xz
video: ssd1307fb: Use gpiod_set_value_cansleep() for reset
The reset signal can be produced by GPIO expander that can sleep. In that case the probe function fails. Allow using GPIO expanders for the reset signal by using the non-atomic gpiod_set_value_cansleep() function. Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/ssd1307fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 6439231f2db2..4061a20cfe24 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -667,9 +667,9 @@ static int ssd1307fb_probe(struct i2c_client *client,
if (par->reset) {
/* Reset the screen */
- gpiod_set_value(par->reset, 0);
+ gpiod_set_value_cansleep(par->reset, 0);
udelay(4);
- gpiod_set_value(par->reset, 1);
+ gpiod_set_value_cansleep(par->reset, 1);
udelay(4);
}