Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754532AbbLKDWx (ORCPT ); Thu, 10 Dec 2015 22:22:53 -0500 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:2863 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754489AbbLKDWu (ORCPT ); Thu, 10 Dec 2015 22:22:50 -0500 X-RM-TRANSID: 2ee7566a4188e93-14616 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee6566a4188191-54949 From: Xiubo Li To: broonie@kernel.org Cc: ckeepax@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, Xiubo Li Subject: [PATCHv2 2/2] regmap: cache: Move the num_reg_defaults check as early as possible Date: Fri, 11 Dec 2015 11:23:20 +0800 Message-Id: <1449804200-8008-3-git-send-email-lixiubo@cmss.chinamobile.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449804200-8008-1-git-send-email-lixiubo@cmss.chinamobile.com> References: <1449804200-8008-1-git-send-email-lixiubo@cmss.chinamobile.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1590 Lines: 47 If the register defaults are provided by the driver without the number by mistake, it should just return an error with one promotion. This should be as early as possible, then there is no need to verify the register defaults' stride and the other code followed. Signed-off-by: Xiubo Li --- drivers/base/regmap/regcache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index d4e96dd..348be3a 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -109,6 +109,12 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) return 0; } + if (config->reg_defaults && !config->num_reg_defaults) { + dev_err(map->dev, + "Register defaults are set without the number!\n"); + return -EINVAL; + } + for (i = 0; i < config->num_reg_defaults; i++) if (config->reg_defaults[i].reg % map->reg_stride) return -EINVAL; @@ -142,8 +148,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) * a copy of it. */ if (config->reg_defaults) { - if (!map->num_reg_defaults) - return -EINVAL; tmp_buf = kmemdup(config->reg_defaults, map->num_reg_defaults * sizeof(struct reg_default), GFP_KERNEL); if (!tmp_buf) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/