The patch

   regmap: Fix unused warning

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 c077fadf4d1e05bcdd7ddb07758cbd8acf0033f6 Mon Sep 17 00:00:00 2001
From: Baolin Wang <[email protected]>
Date: Sat, 4 Nov 2017 14:08:23 +0800
Subject: [PATCH] regmap: Fix unused warning

This patch fixes the warning of label 'err_map' defined but not used.

Signed-off-by: Baolin Wang <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
 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 bfe2f250d011..8d516a9bfc01 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -699,7 +699,7 @@ struct regmap *__regmap_init(struct device *dev,
                map->lock_arg = map;
 #else
                ret = -EINVAL;
-               goto err;
+               goto err_map;
 #endif
        } else {
                if ((bus && bus->fast_io) ||
-- 
2.15.0

Reply via email to