aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/omapdrm/omap_connector.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/omapdrm/omap_connector.c')
-rw-r--r--drivers/staging/omapdrm/omap_connector.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c
index 38be186c249a..91edb3f96972 100644
--- a/drivers/staging/omapdrm/omap_connector.c
+++ b/drivers/staging/omapdrm/omap_connector.c
@@ -146,11 +146,10 @@ enum drm_connector_status omap_connector_detect(
enum drm_connector_status ret;
if (dssdrv->detect) {
- if (dssdrv->detect(dssdev)) {
+ if (dssdrv->detect(dssdev))
ret = connector_status_connected;
- } else {
+ else
ret = connector_status_disconnected;
- }
} else {
ret = connector_status_unknown;
}
@@ -383,9 +382,8 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
return connector;
fail:
- if (connector) {
+ if (connector)
omap_connector_destroy(connector);
- }
return NULL;
}