diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:28:52 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:38:04 -0400 |
| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb /drivers/base/regmap/regmap.c | |
| parent | 4ac073640a528662a7c072a30e92e70ce00ded33 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 78f43fb2fe84..1cf427bc0d4a 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
| @@ -109,7 +109,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg) | |||
| 109 | 109 | ||
| 110 | bool regmap_volatile(struct regmap *map, unsigned int reg) | 110 | bool regmap_volatile(struct regmap *map, unsigned int reg) |
| 111 | { | 111 | { |
| 112 | if (!regmap_readable(map, reg)) | 112 | if (!map->format.format_write && !regmap_readable(map, reg)) |
| 113 | return false; | 113 | return false; |
| 114 | 114 | ||
| 115 | if (map->volatile_reg) | 115 | if (map->volatile_reg) |