diff options
-rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 2 | ||||
-rw-r--r-- | drivers/staging/imx-drm/imx-tve.c | 2 | ||||
-rw-r--r-- | drivers/staging/imx-drm/parallel-display.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 1852300412b4..4289cc8963e4 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -427,6 +427,7 @@ static uint32_t imx_drm_find_crtc_mask(struct imx_drm_device *imxdrm, for (i = 0; i < MAX_CRTC; i++) { struct imx_drm_crtc *imx_drm_crtc = imxdrm->crtc[i]; + if (imx_drm_crtc && imx_drm_crtc->port == port) return drm_crtc_mask(imx_drm_crtc->crtc); } @@ -438,6 +439,7 @@ static struct device_node *imx_drm_of_get_next_endpoint( const struct device_node *parent, struct device_node *prev) { struct device_node *node = of_graph_get_next_endpoint(parent, prev); + of_node_put(prev); return node; } diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c index c628fcdc22ae..31fe7cfe5d35 100644 --- a/drivers/staging/imx-drm/imx-tve.c +++ b/drivers/staging/imx-drm/imx-tve.c @@ -133,6 +133,7 @@ static void tve_lock(void *__tve) __acquires(&tve->lock) { struct imx_tve *tve = __tve; + spin_lock(&tve->lock); } @@ -140,6 +141,7 @@ static void tve_unlock(void *__tve) __releases(&tve->lock) { struct imx_tve *tve = __tve; + spin_unlock(&tve->lock); } diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c index 4ca61afdf622..1998846ff21d 100644 --- a/drivers/staging/imx-drm/parallel-display.c +++ b/drivers/staging/imx-drm/parallel-display.c @@ -70,6 +70,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) if (imxpd->mode_valid) { struct drm_display_mode *mode = drm_mode_create(connector->dev); + if (!mode) return -EINVAL; drm_mode_copy(mode, &imxpd->mode); @@ -80,6 +81,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) if (np) { struct drm_display_mode *mode = drm_mode_create(connector->dev); + if (!mode) return -EINVAL; of_get_drm_display_mode(np, &imxpd->mode, OF_USE_NATIVE_MODE); |