projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'lsk-v4.4-16.05-android'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
atmel-hlcdc
/
atmel_hlcdc_plane.c
diff --git
a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index d0299aed517e61039cd4b0b93897b21f7c13390c..1ffe9c329c46df9a7753291861368b67a3764325 100644
(file)
--- a/
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@
-941,7
+941,7
@@
atmel_hlcdc_plane_create(struct drm_device *dev,
ret = drm_universal_plane_init(dev, &plane->base, 0,
&layer_plane_funcs,
desc->formats->formats,
ret = drm_universal_plane_init(dev, &plane->base, 0,
&layer_plane_funcs,
desc->formats->formats,
- desc->formats->nformats, type);
+ desc->formats->nformats, type
, NULL
);
if (ret)
return ERR_PTR(ret);
if (ret)
return ERR_PTR(ret);