From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48381 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbcDJBGC (ORCPT ); Sat, 9 Apr 2016 21:06:02 -0400 Subject: Patch "gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit" has been added to the 4.5-stable tree To: geert+renesas@glider.be, gregkh@linuxfoundation.org, linus.walleij@linaro.org, preid@electromag.com.au Cc: , From: Date: Sat, 09 Apr 2016 18:06:00 -0700 Message-ID: <146025036017151@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: gpio-pca953x-fix-pca953x_gpio_set_multiple-on-64-bit.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From e0a8604f1300cefab4aeafe214fc57954a7b4487 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 11 Mar 2016 17:31:27 +0100 Subject: gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit From: Geert Uytterhoeven commit e0a8604f1300cefab4aeafe214fc57954a7b4487 upstream. pca953x_gpio_set_multiple() divides by 4 to convert from longs to bytes, which assumes a 32-bit platform, and is not correct on 64-bit platforms. Use "sizeof(...)" instead to fix this. Fixes: b4818afeacbd8182 ("gpio: pca953x: Add set_multiple to allow multiple bits to be set in one write.") Signed-off-by: Geert Uytterhoeven Acked-by: Phil Reid Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- drivers/gpio/gpio-pca953x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -367,9 +367,11 @@ static void pca953x_gpio_set_multiple(st memcpy(reg_val, chip->reg_output, NBANK(chip)); mutex_lock(&chip->i2c_lock); for(bank=0; bank> ((bank % 4) * 8); + unsigned bankmask = mask[bank / sizeof(*mask)] >> + ((bank % sizeof(*mask)) * 8); if(bankmask) { - unsigned bankval = bits[bank/4] >> ((bank % 4) * 8); + unsigned bankval = bits[bank / sizeof(*bits)] >> + ((bank % sizeof(*bits)) * 8); reg_val[bank] = (reg_val[bank] & ~bankmask) | bankval; } } Patches currently in stable-queue which might be from geert+renesas@glider.be are queue-4.5/gpio-pca953x-fix-pca953x_gpio_set_multiple-on-64-bit.patch