git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
exynos
/
exynos7_drm_decon.c
diff --git
a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 63f02e2380ae1a24746ed87153a1703491f23dff..970046199608484365195ecdd78d27fecc57ed4b 100644
(file)
--- a/
drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/
drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@
-888,8
+888,8
@@
static int decon_probe(struct platform_device *pdev)
of_node_put(i80_if_timings);
ctx->regs = of_iomap(dev->of_node, 0);
- if (
IS_ERR(ctx->regs)
) {
- ret =
PTR_ERR(ctx->regs)
;
+ if (
!ctx->regs
) {
+ ret =
-ENOMEM
;
goto err_del_component;
}