diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
| commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
| tree | 5a57c938836d6f2853beaa123d568d128ab76349 /drivers/gpu | |
| parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
| parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
| download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz | |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_flip_work.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_flip_work.c b/drivers/gpu/drm/drm_flip_work.c index e788882..f9c7fa3 100644 --- a/drivers/gpu/drm/drm_flip_work.c +++ b/drivers/gpu/drm/drm_flip_work.c @@ -34,7 +34,7 @@ */ void drm_flip_work_queue(struct drm_flip_work *work, void *val) { - if (kfifo_put(&work->fifo, (const void **)&val)) { + if (kfifo_put(&work->fifo, val)) { atomic_inc(&work->pending); } else { DRM_ERROR("%s fifo full!\n", work->name); |