diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-14 19:33:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-14 19:33:47 -0700 |
| commit | caf382fe31b7327a1e4449f1c05c0cc7fb5b90be (patch) | |
| tree | b7b0fcbf594db884a68cbc354ed933b5c8ad6d61 /drivers/staging/imx-drm | |
| parent | Revert "usb: dwc2: make the scheduler handle excessive NAKs better" (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-dev-caf382fe31b7327a1e4449f1c05c0cc7fb5b90be.tar.xz linux-dev-caf382fe31b7327a1e4449f1c05c0cc7fb5b90be.zip | |
Merge 3.17-rc5 into staging-next.
This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/imx-ldb.c | 3 | ||||
| -rw-r--r-- | drivers/staging/imx-drm/ipuv3-plane.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/imx-ldb.c b/drivers/staging/imx-drm/imx-ldb.c index 7e3f019d7e72..4662e00b456a 100644 --- a/drivers/staging/imx-drm/imx-ldb.c +++ b/drivers/staging/imx-drm/imx-ldb.c @@ -574,6 +574,9 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, for (i = 0; i < 2; i++) { struct imx_ldb_channel *channel = &imx_ldb->channel[i]; + if (!channel->connector.funcs) + continue; + channel->connector.funcs->destroy(&channel->connector); channel->encoder.funcs->destroy(&channel->encoder); } diff --git a/drivers/staging/imx-drm/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c index 6ffe1bbbcf16..697aad25b82d 100644 --- a/drivers/staging/imx-drm/ipuv3-plane.c +++ b/drivers/staging/imx-drm/ipuv3-plane.c @@ -277,7 +277,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); } } |