From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753199AbdKFNex (ORCPT ); Mon, 6 Nov 2017 08:34:53 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64210 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752750AbdKFNev (ORCPT ); Mon, 6 Nov 2017 08:34:51 -0500 From: Arnd Bergmann To: Thomas Gleixner Cc: Arnd Bergmann , Russell King , Kees Cook , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] [fixup timers-conversion] ARM: footbridge: add missing semicolon Date: Mon, 6 Nov 2017 14:34:01 +0100 Message-Id: <20171106133410.467203-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9ZvCJGFLJdTgApMN2nwsRB3j2gk0xiQDjkOYcppYdhvCPTLDW2X bjM4bPFxC0xq0CTRNBD83s4QYr/+wOYwAluKBaIHGqAoqceueiiHcDlCGbETtsBqgQa2KD+ EsKIkcPr54PEeZS5PIZcnRGac90M/W2/zP+f+8PZvOYOLBbsBqdutLPUiyW6irvoOlknT3d 2QW7Wm2SEYtYKlyAE0ldg== X-UI-Out-Filterresults: notjunk:1;V01:K0:3qBMl4qqXOw=:fMlNDXWzw78eX7NgBah5of e90iLGLHh5rDfeTqB4XYMWTRaVLSptOvyF5ToCqT/2ISXo6fqkbqAs6jnRSR2PLAzWr0RFd0H PHV6zP5I5Q8RloU+R4fYp+N7bKxpHzjqSGpu2DElahvt6Cdo1SOFvjpM2zy2rqdutR+nHepla n9MFfiDBDfd+bbfVu5cEZSuAjWBJouVvQ6P3SAB2eo56rP89OdpCKUYXpJJDE6xg12u2JJD4S TLaakBOFDSzBqUJGB3tQRZDxONpm/zGhnOVRXwMl8LUyNJxxPi8O1U5f1+0sWM2wWKe6olUu6 ZRY1ECMEFrZB3YsmBIEsXIMBLFFLe0zrVxaOmadenpIpZdLxgC0dcjHf0afbKvG+QSG8ZsLLx vIsS81fOgeHQPAmDeRje5ApuuvxSWullCn88sZcg73hCvFQCQ5c3JnNDXcXoAAsMpMckYI6gm KsiYt0wOf+J4vYninsh7QEDF2NafBM35jrt0On+V++s8uH3NRibk+X/bck7CqSZmpc1FqO/IU 7wYOZSGqOWkgbSH/QBWxxaWh/dUY1OXH3va3/8ZlROShyj7rCdVlNo/sj6icsz22WizEDIR8t IoR9SFD/P2C1wapseqWtiM6cS16qNUKFUNPZwpMu3iy7jNUoIJ1lusopRqmMOt3cJtECDFAYg yN6wRHvAs4OYe07cOo52rmMwSzVOy+GYdieZ4LqeOiVXDLYna+Y7mgX6ILDmgfVVd1N/FaFru TNqSD3NdmgMMS+AGIdtB1ErJuj6JViVNXt50nw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The timer_setup() conversion included a small typo that breaks the build: arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_enable_error': arch/arm/mach-footbridge/dc21285.c:145:2: error: expected ';' before 'else' else if (timer == &perr_timer) Fixes: b7bea32f0cc4 ("ARM: footbridge: Convert timers to use timer_setup()") Cc: Thomas Gleixner Signed-off-by: Arnd Bergmann --- The broken patch is currently in -tip and came in through timers-conversion-next3. Please apply this one on top, or fold it into the original patch if possible --- arch/arm/mach-footbridge/dc21285.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index 8407e4a07c77..e7b350f18f5f 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -141,7 +141,7 @@ static void dc21285_enable_error(struct timer_list *timer) del_timer(timer); if (timer == &serr_timer) - enable_irq(IRQ_PCI_SERR) + enable_irq(IRQ_PCI_SERR); else if (timer == &perr_timer) enable_irq(IRQ_PCI_PERR); } -- 2.9.0