diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 12:00:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 12:00:18 -0700 |
| commit | a6988b334398513fbb423d66f1b85d0909f53d24 (patch) | |
| tree | 89ab10ae119a1c88676dd9cc6b1a89e5eadf7c36 /drivers/staging/imx-drm/ipuv3-plane.c | |
| parent | 09db9d63405e47db5ab60a7ec0bc2f5d58decc9b (diff) | |
| parent | 3ea411c56ef58a1827cf06fdcdeb14fa9265be09 (diff) | |
| download | linux-a6988b334398513fbb423d66f1b85d0909f53d24.tar.bz2 | |
Merge tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are 3 tiny staging driver fixes for 3.17-rc5.
Two are fixes for the imx-drm driver, resolving issues that have been
reported. The other is a memory leak fix for the Android sync driver,
due to changes that went into 3.17-rc1.
All have been in linux-next for a while"
* tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
android: fix reference leak in sync_fence_create
imx-drm: imx-ldb: fix NULL pointer in imx_ldb_unbind()
imx-drm: ipuv3-plane: fix ipu_plane_dpms()
Diffstat (limited to 'drivers/staging/imx-drm/ipuv3-plane.c')
| -rw-r--r-- | drivers/staging/imx-drm/ipuv3-plane.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c index 6f393a11f44d..50de10a550e9 100644 --- a/drivers/staging/imx-drm/ipuv3-plane.c +++ b/drivers/staging/imx-drm/ipuv3-plane.c @@ -281,7 +281,8 @@ static void ipu_plane_dpms(struct ipu_plane *ipu_plane, int mode) ipu_idmac_put(ipu_plane->ipu_ch); ipu_dmfc_put(ipu_plane->dmfc); - ipu_dp_put(ipu_plane->dp); + if (ipu_plane->dp) + ipu_dp_put(ipu_plane->dp); } } |