From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935250AbcIFNNi (ORCPT ); Tue, 6 Sep 2016 09:13:38 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53784 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935179AbcIFNNg (ORCPT ); Tue, 6 Sep 2016 09:13:36 -0400 From: Arnd Bergmann To: Lee Jones Cc: Andy Yan , Arnd Bergmann , Wadim Egorov , linux-kernel@vger.kernel.org Subject: [PATCH] rk808: fix RK818_IRQ_DISCHG_ILIM initializer Date: Tue, 6 Sep 2016 15:13:01 +0200 Message-Id: <20160906131351.1845848-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:GuZdwcDIC4rXOpjMRKdRTvWzfSDng1q3evZhPoQn5hEZAhvwvvv Macqgk1RZEP28vwr+VuWvW1AbptisaG0Q7WSp7cCWWo50FBCsoDPJ9i+Hz5OR0lA/smwTtG yRcrNaFx59b+xRL4lIZ+2y9ezjGiZ/TzZuOwCPPmGSrDd6tYVS0PobjmQJAinqW7GuQNO96 RrRwuIiq+Dx6VVqmh3sBg== X-UI-Out-Filterresults: notjunk:1;V01:K0:RknFiWuc0tI=:IUp9IKPSbFTSGiYbUWgayw iG9x9zYpsnUeeJB6tK/urr6AePsK7L04PJcbAP8YrnDl5BDroJ/1EaCTMZFxK7BiNwh21XYfp R5qRzkaKPRRW9u17B+T6sB/kOuvgFFlm2jcz07eHARxkDpzUHletxAsQ5oQlx1X2+qeVJjD17 kbzGfW9iTd99fExsqaQ/ufr7B9ZsjltlzB5wL8w18mIl1luO2ALykRWWb8/56ZsEhsSVFTXa9 yrWRcON3WWgDF4SNVVQVZL9Tf5ADXiJ3RBvms5OZfQOpa/xnXXCyRRhEed2IgoRBx2Lw2gAJD 3fNL7QRPFivtCTF6D0eZuThF/LGZzd5BtIB4QGA7CkWGsycIjIhCovJu4601CsKydJVSPLUZV cRgL8jvslXbvRfQLdk2g4IVcscvHqvrqzxpWOXCCtFO2EHhBlj23maUO72Y9wF3ozkPlg0+GO q2O+bKkb3N3nU6f43IJbVMFxm7e8eMNP2JPsNxBv7yryqMau5bZyEuljDoHho93aV24vyXRVE 8SZhIulCF3E0zohCsPBZS7HwQTDXRs3B1/8TQymYic5Yb7Op6JE8F8P8kIqr9YwRfKg6MWPD0 e4dY1+O+tTmoScMtT9wNzS9LSIeDs3vbVxyzdwXbJK2tWW5g8m5a/y5jcOv3tTnSE3lKCOMGK HOAigdDL404ep7xWbcPNnUBzQK7vbz0aIqnMYiF3TCZcB5kBVogtS7XDco7Dtah6qmlM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building with -Woverride-init, we get a warning about an incorrect initializer: drivers/mfd/rk808.c:244:8: error: initialized field overwritten [-Werror=override-init] [RK818_IRQ_DISCHG_ILIM] = { This is clearly a mistake, as both RK818_IRQ_DISCHG_ILIM and RK818_IRQ_USB_OV are defined as '7', but they refer to different register bits. Changing RK818_IRQ_DISCHG_ILIM to 15 is consistent with how all other 14 interrupts are handled here, so I'm assuming this is what it should have been. Signed-off-by: Arnd Bergmann Fixes: 2eedcbfc0612 ("mfd: rk808: Add RK818 support") --- include/linux/mfd/rk808.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index fc5db6fcb57d..6d435a3c06bc 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -244,7 +244,7 @@ enum rk818_reg { #define RK818_IRQ_CHG_TS1 12 #define RK818_IRQ_TS2 13 #define RK818_IRQ_CHG_CVTLIM 14 -#define RK818_IRQ_DISCHG_ILIM 7 +#define RK818_IRQ_DISCHG_ILIM 15 #define RK818_IRQ_VOUT_LO_MSK BIT(0) #define RK818_IRQ_VB_LO_MSK BIT(1) -- 2.9.0