aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-31 14:25:16 -0400
committerMark Brown <broonie@linaro.org>2013-08-31 14:25:16 -0400
commit365c9ee0731de96046cc7749b46a5e7a0b0ceb65 (patch)
tree6ac555cb5cd296491d94216aaa3fd0e51685c0e7
parent4460d028d4779900802d2184334d90d7ef1d2600 (diff)
parentb4519c71c45b31f5acd6db984c8830e52120323a (diff)
Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index aaf4e1372980..7d689a15c500 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map)
303} 303}
304 304
305static void regmap_lock_spinlock(void *__map) 305static void regmap_lock_spinlock(void *__map)
306__acquires(&map->spinlock)
306{ 307{
307 struct regmap *map = __map; 308 struct regmap *map = __map;
308 unsigned long flags; 309 unsigned long flags;
@@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map)
312} 313}
313 314
314static void regmap_unlock_spinlock(void *__map) 315static void regmap_unlock_spinlock(void *__map)
316__releases(&map->spinlock)
315{ 317{
316 struct regmap *map = __map; 318 struct regmap *map = __map;
317 spin_unlock_irqrestore(&map->spinlock, map->spinlock_flags); 319 spin_unlock_irqrestore(&map->spinlock, map->spinlock_flags);