From bdd0549394cc8848ee89a7b8ec0d89a0bcb9a363 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Wed, 14 Nov 2012 19:31:27 +0900 Subject: [PATCH] --- yaml --- r: 337962 b: refs/heads/master c: 582bc28c2d1c0fe45ba797c48b46a8dda537c4b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_encoder.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 643af4f1b5be..27f414819675 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc1e1581763de164c79e76669f754b3608680153 +refs/heads/master: 582bc28c2d1c0fe45ba797c48b46a8dda537c4b4 diff --git a/trunk/drivers/staging/omapdrm/omap_encoder.c b/trunk/drivers/staging/omapdrm/omap_encoder.c index 31c735d39217..5341d5e3e317 100644 --- a/trunk/drivers/staging/omapdrm/omap_encoder.c +++ b/trunk/drivers/staging/omapdrm/omap_encoder.c @@ -72,9 +72,9 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, for (i = 0; i < priv->num_connectors; i++) { struct drm_connector *connector = priv->connectors[i]; - if (connector->encoder == encoder) { + if (connector->encoder == encoder) omap_connector_mode_set(connector, mode); - } + } } @@ -163,9 +163,8 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev, return encoder; fail: - if (encoder) { + if (encoder) omap_encoder_destroy(encoder); - } return NULL; }