From d43218476e6ce31c0103b3c55207a772d1fcbc62 Mon Sep 17 00:00:00 2001 From: Namjae Jeon Date: Sun, 20 May 2012 03:08:01 -0400 Subject: [PATCH] --- yaml --- r: 309650 b: refs/heads/master c: 4886b1afee5aaccc2fb3202620a5608caf0c9284 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ufs/ufshcd.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2907da5ba899..394f21c91fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 841f97bffc11daaef9eb28d201be25b1509db97d +refs/heads/master: 4886b1afee5aaccc2fb3202620a5608caf0c9284 diff --git a/trunk/drivers/scsi/ufs/ufshcd.c b/trunk/drivers/scsi/ufs/ufshcd.c index 4e010b727818..6a4fd00117ca 100644 --- a/trunk/drivers/scsi/ufs/ufshcd.c +++ b/trunk/drivers/scsi/ufs/ufshcd.c @@ -1836,7 +1836,7 @@ ufshcd_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = pci_request_regions(pdev, UFSHCD); if (err < 0) { dev_err(&pdev->dev, "request regions failed\n"); - goto out_disable; + goto out_host_put; } hba->mmio_base = pci_ioremap_bar(pdev, 0); @@ -1925,8 +1925,9 @@ ufshcd_probe(struct pci_dev *pdev, const struct pci_device_id *id) iounmap(hba->mmio_base); out_release_regions: pci_release_regions(pdev); -out_disable: +out_host_put: scsi_host_put(host); +out_disable: pci_clear_master(pdev); pci_disable_device(pdev); out_error: