summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/omapfb/omapfb-sysfs.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@nokia.com>2010-03-17 22:42:06 +0300
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-03 16:18:46 +0400
commit3d84b65aa63833a2ac07b1cc626984a1e1485fed (patch)
tree532d91bff861f241b6cd8e9031a286a557926398 /drivers/video/omap2/omapfb/omapfb-sysfs.c
parent2f642a17503838e256b8b7e9f1153512e2efc38b (diff)
downloadlinux-3d84b65aa63833a2ac07b1cc626984a1e1485fed.tar.xz
OMAP: DSS2: OMAPFB: Make lockdep happy
When more than one memory region needs to be lockd at the same time use the memory region id to fix the order in which the locks are taken. Also one needs to use the _nested() versions of the locking primitives. The memory region id can serve as the lock class there as well. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-sysfs.c')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
index 724b760404f2..1e714bb48d39 100644
--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -452,7 +452,7 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
rg = ofbi->region;
- down_write(&rg->lock);
+ down_write_nested(&rg->lock, rg->id);
if (atomic_read(&rg->map_count)) {
r = -EBUSY;