From 1b02fdc4d012a2d85eefd38e67399c8ac604b160 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Wed, 14 Nov 2012 19:41:13 +0900 Subject: [PATCH] --- yaml --- r: 337971 b: refs/heads/master c: c17d37df984b0eaf67d422b2698755fe71d6d1e0 h: refs/heads/master i: 337969: ea347c4fa41730613c4944bd93e47d1bf1936096 337967: 484dcc3295aa92a3ab38803fe446a047a8976de6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_plane.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 453e5bafe73c..5f53af4c7674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 373de7f4f7a52d3d18cbe78087325f98e3b7cded +refs/heads/master: c17d37df984b0eaf67d422b2698755fe71d6d1e0 diff --git a/trunk/drivers/staging/omapdrm/omap_plane.c b/trunk/drivers/staging/omapdrm/omap_plane.c index 25d78ca6fdb4..2a8e5bab49c9 100644 --- a/trunk/drivers/staging/omapdrm/omap_plane.c +++ b/trunk/drivers/staging/omapdrm/omap_plane.c @@ -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;