From patchwork Mon Oct 4 14:24:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 228611 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o94HOq1a004239 for ; Mon, 4 Oct 2010 17:25:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756324Ab0JDPre (ORCPT ); Mon, 4 Oct 2010 11:47:34 -0400 Received: from lxorguk.ukuu.org.uk ([81.2.110.251]:46815 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756275Ab0JDPre (ORCPT ); Mon, 4 Oct 2010 11:47:34 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 17:25:11 +0000 (UTC) X-Greylist: delayed 2035 seconds by postgrey-1.27 at vger.kernel.org; Mon, 04 Oct 2010 11:47:31 EDT Received: from localhost.localdomain (earthlight.etchedpixels.co.uk [81.2.110.250]) by lxorguk.ukuu.org.uk (8.14.4/8.14.1) with ESMTP id o94EgleM024702 for ; Mon, 4 Oct 2010 15:42:52 +0100 From: Alan Cox Subject: [PATCH 1/3] sdhci: Allow the probe handler to override slots To: linux-mmc@vger.kernel.org Date: Mon, 04 Oct 2010 15:24:21 +0100 Message-ID: <20101004142406.901.44820.stgit@localhost.localdomain> In-Reply-To: <20101004142246.901.37491.stgit@localhost.localdomain> References: <20101004142246.901.37491.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index e8aa99d..4f5d6d0 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -818,6 +818,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, goto free; } + slots = chip->num_slots; /* Quirk may have changed this */ + for (i = 0;i < slots;i++) { slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i); if (IS_ERR(slot)) {