Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337971
b: refs/heads/master
c: c17d37d
h: refs/heads/master
i:
  337969: ea347c4
  337967: 484dcc3
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 15, 2012
1 parent d0c9566 commit 1b02fdc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 373de7f4f7a52d3d18cbe78087325f98e3b7cded
refs/heads/master: c17d37df984b0eaf67d422b2698755fe71d6d1e0
4 changes: 2 additions & 2 deletions trunk/drivers/staging/omapdrm/omap_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ void omap_plane_install_properties(struct drm_plane *plane,
drm_object_attach_property(obj, prop, 0);
}

prop = priv->zorder_prop;
if (!prop) {
prop = priv->zorder_prop;
if (!prop) {
prop = drm_property_create_range(dev, 0, "zorder", 0, 3);
if (prop == NULL)
return;
Expand Down

0 comments on commit 1b02fdc

Please sign in to comment.