From patchwork Tue Jan 7 11:54:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3447291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 308B7C02DC for ; Tue, 7 Jan 2014 11:56:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3521620115 for ; Tue, 7 Jan 2014 11:56:22 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB6212010C for ; Tue, 7 Jan 2014 11:56:20 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0VGO-0004ln-TL; Tue, 07 Jan 2014 11:56:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0VGM-0004Sn-I0; Tue, 07 Jan 2014 11:56:02 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0VGJ-0004S7-Ef for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2014 11:56:00 +0000 Received: from wuerfel.localnet (HSI-KBW-085-216-031-165.hsi.kabelbw.de [85.216.31.165]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M0RJt-1V87Xq29FN-00uLk1; Tue, 07 Jan 2014 12:54:59 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Subject: ohci-at91 mismerge build error Date: Tue, 07 Jan 2014 12:54:58 +0100 Message-ID: <20240208.HaoioSGuhF@wuerfel> User-Agent: KMail/4.11 rc1 (Linux/3.10.0-5-generic; KDE/4.11.2; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:5gyD5VqWX7GKXjNBf2Ca+0q1+J1zov7yniBZwFKOo8P QcwN20SdVEPIc1XIercPLN/NJ0qOytmr8JzVYhthGGkhUeNL1b bjVpxuy7iQ2Kf5rm8WBXwzydn/QXdM2gZihR0UF7Rtzz809X32 vw38vDFvfsTHM9LMEAKL5qoe2X52tywmG9wUNuc+sRaqgJS7qu OB662s5C5V3t8sbBLZs4mtSth/V4D79Fi+QVzoduCeKRouUuuy Ox5vj8CPRHn6RpSWaFS5dY8bg3SSEZZy71IbzXquxnnlXxZn9U VSR4UqCjx0VRk8SfpjBVIEmmAmZ3xJutg0N+laCbKQQhDoPQPb sEEwUuZSBLyNZnAmcoLA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140107_065559_703817_34CDA303 X-CRM114-Status: UNSURE ( 6.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: linux-usb@vger.kernel.org, Nicolas Ferre , linux-kernel@vger.kernel.org, Boris BREZILLON , Alan Stern , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After commit 99f14bd4d1 "Merge 3.13-rc5 into usb-next" (in linux-next as of today), I'm getting this error building any at91 kernel: drivers/usb/host/ohci-at91.c: In function 'usb_hcd_at91_probe': drivers/usb/host/ohci-at91.c:190:4: error: label 'err' used but not defined goto err; ^ drivers/usb/host/ohci-at91.c: At top level: drivers/usb/host/ohci-at91.c:206:2: warning: data definition has no type or storage class [enabled by default] at91_stop_hc(pdev); ^ ... The problem is obviously a mismerge between two unrelated changes that resulted in missing opening braces. Signed-off-by: Arnd Bergmann Acked-by: Boris BREZILLON --- Please just ignore if this has been reported before diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 2d0ee5e..091ae49 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -197,7 +197,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, at91_start_hc(pdev); retval = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (retval == 0) + if (retval == 0) { device_wakeup_enable(hcd->self.controller); return retval; }