lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 107/196] mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
    Date
    From: Chris Ball <cjb@laptop.org>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 upstream.

    If pci_ioremap_bar() fails during probe, we "goto release;" and free the
    host, but then we return 0 -- which tells sdhci_pci_probe() that the probe
    succeeded. Since we think the probe succeeded, when we unload sdhci we'll
    go to sdhci_pci_remove_slot() and it will try to dereference slot->host,
    which is now NULL because we freed it in the error path earlier.

    The patch simply sets ret appropriately, so that sdhci_pci_probe() will
    detect the failure immediately and bail out.

    Signed-off-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/mmc/host/sdhci-pci.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
    index 6701af6..e907447 100644
    --- a/drivers/mmc/host/sdhci-pci.c
    +++ b/drivers/mmc/host/sdhci-pci.c
    @@ -653,6 +653,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
    host->ioaddr = pci_ioremap_bar(pdev, bar);
    if (!host->ioaddr) {
    dev_err(&pdev->dev, "failed to remap registers\n");
    + ret = -ENOMEM;
    goto release;
    }

    --
    1.7.9.3


    \
     
     \ /
      Last update: 2012-03-13 01:25    [W:0.019 / U:95.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site