From patchwork Tue Oct 9 15:37:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1570601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 816B140135 for ; Tue, 9 Oct 2012 15:39:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLbsT-0002TZ-4J; Tue, 09 Oct 2012 15:37:49 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TLbsL-0002Qy-SA for linux-arm-kernel@lists.infradead.org; Tue, 09 Oct 2012 15:37:42 +0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MSFaB-1SyDKJ3V8N-00TSy9; Tue, 09 Oct 2012 17:37:25 +0200 From: Arnd Bergmann To: Chris Ball Subject: [PATCH] mmc: mxs: fix build regression from mismerge Date: Tue, 9 Oct 2012 15:37:23 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201210091537.23659.arnd@arndb.de> X-Provags-ID: V02:K0:A71XSrEK2ujg/IJNF17tbmLpuLiOxEVZlYRRguzz1Hw 8S3o6exYaiFKW4t4AUK+AX+WoKgUJ9Duzc7/bcVt7n6jhc8FKq ZjQITomX60y0XAhgVtp4Dj65qc0b64i77IioBajo/NFLXNbgi7 sXimsxpFtYTj5mwLP14BHG19sX3JTYsqzEz+Ma/+prksy6Y0lb pQinTEfIb5QPkwxqJBRLxvLgaJdA5HYefQHje6go8vE+V8Oxz5 66pZTNBfv5V11HaqFAFG5ZNcvXni5tr671lmqnu0dxzAG5YB7b oPFPvfkJUfKe3aT8cO1BUoUpusLjNgflAg+LGZxKBDdOIk8nwX uCmhXGN+T7ryS9nEeT2o= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marek Vasut , Shawn Guo , Mark Brown , linux-mmc@vger.kernel.org, Attila Kinali , Lauri Hintsala , Chris Ball , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From all I can tell, the patches fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" came in through separate branches and cause this build error when combined. drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no member named 'base' drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member named 'devid' This does the obvious missing change. Signed-off-by: Arnd Bergmann Cc: Attila Kinali Cc: Lauri Hintsala Cc: Marek Vasut Cc: Chris Ball Cc: Shawn Guo Cc: Mark Brown diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index bb4c2bf..80d1e6d 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); writel(BM_SSP_CTRL1_SDIO_IRQ_EN, - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); } else { writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);