From: Akinobu Mita Date: Mon, 29 Jul 2013 19:06:02 +0000 (+0530) Subject: [SCSI] ufs: don't disable_irq() if the IRQ can be shared among devices X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e0f4b7c5acbac65d2f56ed5e1d2d8036f9db936e;p=openwrt%2Fstaging%2Fblogic.git [SCSI] ufs: don't disable_irq() if the IRQ can be shared among devices When removing the UFS driver, disable_irq() is called and the IRQ is not enabled again. Unfortunately, the IRQ is requested with IRQF_SHARED and it can be shared among several devices. So disabling the IRQ in this way is just breaking other devices which are sharing the IRQ. Signed-off-by: Akinobu Mita Signed-off-by: Santosh Y Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index 24d6ba717144..a823cf44e949 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c @@ -131,8 +131,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) pm_runtime_forbid(&pdev->dev); pm_runtime_get_noresume(&pdev->dev); - - disable_irq(pdev->irq); ufshcd_remove(hba); pci_set_drvdata(pdev, NULL); } diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index c5c28357fb63..8b4a27fdbb3e 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -188,8 +188,6 @@ static int ufshcd_pltfrm_remove(struct platform_device *pdev) struct ufs_hba *hba = platform_get_drvdata(pdev); pm_runtime_get_sync(&(pdev)->dev); - - disable_irq(hba->irq); ufshcd_remove(hba); return 0; }