Applied "regmap: Correct comparison in regmap_cached" to the regmap tree

2018-02-13 Thread Mark Brown
The patch

   regmap: Correct comparison in regmap_cached

has been applied to the regmap tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 71df179363a5a733a8932e9afb869760d7559383 Mon Sep 17 00:00:00 2001
From: Charles Keepax 
Date: Mon, 12 Feb 2018 18:15:44 +
Subject: [PATCH] regmap: Correct comparison in regmap_cached

The cache pointer points to the actual memory used by the cache, as the
comparison here is looking for the type of the cache it should check
against cache_type.

Fixes: 1ea975cf1ef5 ("regmap: Add a function to check if a regmap register is 
cached")
Signed-off-by: Charles Keepax 
Signed-off-by: Mark Brown 
---
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index ee302ccdfbc8..7519b039c162 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -99,7 +99,7 @@ bool regmap_cached(struct regmap *map, unsigned int reg)
int ret;
unsigned int val;
 
-   if (map->cache == REGCACHE_NONE)
+   if (map->cache_type == REGCACHE_NONE)
return false;
 
if (!map->cache_ops)
-- 
2.16.1



Applied "regmap: Correct comparison in regmap_cached" to the regmap tree

2018-02-13 Thread Mark Brown
The patch

   regmap: Correct comparison in regmap_cached

has been applied to the regmap tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 71df179363a5a733a8932e9afb869760d7559383 Mon Sep 17 00:00:00 2001
From: Charles Keepax 
Date: Mon, 12 Feb 2018 18:15:44 +
Subject: [PATCH] regmap: Correct comparison in regmap_cached

The cache pointer points to the actual memory used by the cache, as the
comparison here is looking for the type of the cache it should check
against cache_type.

Fixes: 1ea975cf1ef5 ("regmap: Add a function to check if a regmap register is 
cached")
Signed-off-by: Charles Keepax 
Signed-off-by: Mark Brown 
---
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index ee302ccdfbc8..7519b039c162 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -99,7 +99,7 @@ bool regmap_cached(struct regmap *map, unsigned int reg)
int ret;
unsigned int val;
 
-   if (map->cache == REGCACHE_NONE)
+   if (map->cache_type == REGCACHE_NONE)
return false;
 
if (!map->cache_ops)
-- 
2.16.1