Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337963
b: refs/heads/master
c: ddcd49e
h: refs/heads/master
i:
  337961: f8b874d
  337959: 8f9e359
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent bdd0549 commit 45365a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 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: 582bc28c2d1c0fe45ba797c48b46a8dda537c4b4
refs/heads/master: ddcd49ed6e74f98a643532ec4ccac8841099785c
11 changes: 5 additions & 6 deletions trunk/drivers/staging/omapdrm/omap_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,17 +307,16 @@ struct drm_connector *omap_framebuffer_get_next_connector(
struct list_head *connector_list = &dev->mode_config.connector_list;
struct drm_connector *connector = from;

if (!from) {
if (!from)
return list_first_entry(connector_list, typeof(*from), head);
}

list_for_each_entry_from(connector, connector_list, head) {
if (connector != from) {
struct drm_encoder *encoder = connector->encoder;
struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
if (crtc && crtc->fb == fb) {
if (crtc && crtc->fb == fb)
return connector;
}

}
}

Expand Down Expand Up @@ -466,8 +465,8 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
return fb;

fail:
if (fb) {
if (fb)
omap_framebuffer_destroy(fb);
}

return ERR_PTR(ret);
}

0 comments on commit 45365a2

Please sign in to comment.