Hi Alexander,

On Tue, Mar 13 2012, Alexander Stein wrote:
> Signed-off-by: Alexander Stein <[email protected]>
> ---
>  drivers/mmc/host/sdhci-pci.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
> index 7165e6a..9382f27 100644
> --- a/drivers/mmc/host/sdhci-pci.c
> +++ b/drivers/mmc/host/sdhci-pci.c
> @@ -1379,6 +1379,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev 
> *pdev,
>  
>       slots = chip->num_slots;        /* Quirk may have changed this */
>  
> +     pci_enable_msi(pdev);
> +
>       for (i = 0; i < slots; i++) {
>               slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);
>               if (IS_ERR(slot)) {
> @@ -1397,6 +1399,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev 
> *pdev,
>       return 0;
>  
>  free:
> +     pci_disable_msi(pdev);
> +
>       pci_set_drvdata(pdev, NULL);
>       kfree(chip);
>  
> @@ -1419,6 +1423,8 @@ static void __devexit sdhci_pci_remove(struct pci_dev 
> *pdev)
>               for (i = 0; i < chip->num_slots; i++)
>                       sdhci_pci_remove_slot(chip->slots[i]);
>  
> +             pci_disable_msi(pdev);
> +
>               pci_set_drvdata(pdev, NULL);
>               kfree(chip);
>       }

Thanks, I've merged all three patches to mmc-next for 3.4, using v2 of
patches 2 and 3, and adding Adrian's ACK to patch 2.

- Chris.
-- 
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to