Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344700
b: refs/heads/master
c: c7e1eae
h: refs/heads/master
v: v3
  • Loading branch information
Tomi Valkeinen committed Dec 13, 2012
1 parent 13d1072 commit 67ab337
Show file tree
Hide file tree
Showing 2 changed files with 7 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: fa0c5e71295fa4d62b900818d900c16980985e72
refs/heads/master: c7e1eae537652330cec3fbf5f8f50000b2f24269
12 changes: 6 additions & 6 deletions trunk/drivers/video/omap2/omapfb/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,16 @@ int omapfb_set_update_mode(struct fb_info *fbi, enum omapfb_update_mode mode);
static inline struct omap_dss_device *fb2display(struct fb_info *fbi)
{
struct omapfb_info *ofbi = FB2OFB(fbi);
int i;
struct omap_overlay *ovl;

/* XXX: returns the display connected to first attached overlay */
for (i = 0; i < ofbi->num_overlays; i++) {
struct omap_overlay *ovl = ofbi->overlays[i];

return ovl->get_device(ovl);
}
if (ofbi->num_overlays == 0)
return NULL;

return NULL;
ovl = ofbi->overlays[0];

return ovl->get_device(ovl);
}

static inline struct omapfb_display_data *get_display_data(
Expand Down

0 comments on commit 67ab337

Please sign in to comment.