Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337962
b: refs/heads/master
c: 582bc28
h: refs/heads/master
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent f8b874d commit bdd0549
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bc1e1581763de164c79e76669f754b3608680153
refs/heads/master: 582bc28c2d1c0fe45ba797c48b46a8dda537c4b4
7 changes: 3 additions & 4 deletions trunk/drivers/staging/omapdrm/omap_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
}

Expand Down Expand Up @@ -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;
}

0 comments on commit bdd0549

Please sign in to comment.