From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932940AbbEOJZa (ORCPT ); Fri, 15 May 2015 05:25:30 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:46720 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753467AbbEOJZZ (ORCPT ); Fri, 15 May 2015 05:25:25 -0400 Date: Fri, 15 May 2015 12:25:01 +0300 From: Dan Carpenter To: Chanwoo Choi , Krzysztof Kozlowski Cc: Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] regulator: max77686: fix a shift wrapping bug Message-ID: <20150515092501.GB21508@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We need to be able to handle more than 32 bits here because "id" can go up to MAX77686_BUCK9 (34). ->gpio_enabled is a u64 so that's fine already. Fixes: 3307e9025d29 ('regulator: max77686: Add GPIO control') Signed-off-by: Dan Carpenter diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 23b7c06..59b3210 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686, case MAX77686_BUCK8: case MAX77686_BUCK9: case MAX77686_LDO20 ... MAX77686_LDO22: - if (max77686->gpio_enabled & (1 << id)) + if (max77686->gpio_enabled & (1ULL << id)) return MAX77686_GPIO_CONTROL; } @@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np, } if (gpio_is_valid(config->ena_gpio)) { - max77686->gpio_enabled |= (1 << desc->id); + max77686->gpio_enabled |= (1ULL << desc->id); return regmap_update_bits(config->regmap, desc->enable_reg, desc->enable_mask,