renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

fbdev/ssd1307fb: fix optional VBAT support

Browse Source 
SSD1306 needs VBAT when it is wired in charge pump configuration only.
Other controllers of the SSD1307 family do not need it at all. This was
introduced by commit ba14301e03 ("fbdev/ssd1307fb: add support to
enable VBAT").

Without VBAT configuration the driver now fails with:

	failed to get VBAT regulator: -19

This is caused by misinterpretation of devm_regulator_get_optional
which "returns a struct regulator corresponding to the regulator
producer or IS_ERR() condition".

Handle -ENODEV without bailing out and making VBAT support really
optional.

Signed-off-by: Bastian Stender <bst@pengutronix.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Roger Quadros <rogerq@ti.com>
[b.zolnierkie: minor fixups]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Bastian Stender 2017-04-07 17:28:23 +02:00 committed by Bartlomiej Zolnierkiewicz
parent c1ae3cfa0e
commit cfc5b2b551
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/fbdev/ssd1307fb.c
View File

@ -578,10 +578,14 @@ static int ssd1307fb_probe(struct i2c_client *client,
par->vbat_reg = devm_regulator_get_optional(&client->dev, "vbat"); par->vbat_reg = devm_regulator_get_optional(&client->dev, "vbat");
if (IS_ERR(par->vbat_reg)) { if (IS_ERR(par->vbat_reg)) {
dev_err(&client->dev, "failed to get VBAT regulator: %ld\n",
PTR_ERR(par->vbat_reg));
ret = PTR_ERR(par->vbat_reg); ret = PTR_ERR(par->vbat_reg);
goto fb_alloc_error; if (ret == -ENODEV) {
par->vbat_reg = NULL;
} else {
dev_err(&client->dev, "failed to get VBAT regulator: %d\n",
ret);
goto fb_alloc_error;
}
} }
if (of_property_read_u32(node, "solomon,width", &par->width)) if (of_property_read_u32(node, "solomon,width", &par->width))
@ -668,10 +672,13 @@ static int ssd1307fb_probe(struct i2c_client *client,
udelay(4); udelay(4);
} }
ret = regulator_enable(par->vbat_reg); if (par->vbat_reg) {
if (ret) { ret = regulator_enable(par->vbat_reg);
dev_err(&client->dev, "failed to enable VBAT: %d\n", ret); if (ret) {
goto reset_oled_error; dev_err(&client->dev, "failed to enable VBAT: %d\n",
ret);
goto reset_oled_error;
}
} }
ret = ssd1307fb_init(par); ret = ssd1307fb_init(par);
@ -710,7 +717,8 @@ panel_init_error:
pwm_put(par->pwm); pwm_put(par->pwm);
}; };
regulator_enable_error: regulator_enable_error:
regulator_disable(par->vbat_reg); if (par->vbat_reg)
regulator_disable(par->vbat_reg);
reset_oled_error: reset_oled_error:
fb_deferred_io_cleanup(info); fb_deferred_io_cleanup(info);
fb_alloc_error: fb_alloc_error: