summaryrefslogtreecommitdiffstats
path: root/drivers/video/stm.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:05 +0200
commit9b1102c02bfd39352e0d2995c733edb7be3b0601 (patch)
tree3f089c640bab75c020b69f5dcf44d744a0a7f2e4 /drivers/video/stm.c
parentf48a1596f4e911d4516b986e4778f18321b39b48 (diff)
parenta10dbfc4175867c0d15f02b7f244837c5d41478e (diff)
downloadbarebox-9b1102c02bfd39352e0d2995c733edb7be3b0601.tar.gz
barebox-9b1102c02bfd39352e0d2995c733edb7be3b0601.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/video/stm.c')
-rw-r--r--drivers/video/stm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index 0c190d36ae..d4a618fe50 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -551,9 +551,9 @@ static int stmfb_probe(struct device_d *hw_dev)
}
modes = of_get_display_timings(display);
- if (IS_ERR(modes)) {
+ if (!modes) {
dev_err(hw_dev, "unable to parse display timings\n");
- return PTR_ERR(modes);
+ return -EINVAL;
}
fbi.info.modes.modes = modes->modes;