| From 399497c42787058e76feaec15404d3dbc0aa9000 Mon Sep 17 00:00:00 2001 |
| From: Xiang Chen <chenxiang66@hisilicon.com> |
| Date: Sat, 7 Sep 2019 09:07:30 +0800 |
| Subject: [PATCH] scsi: megaraid: disable device when probe failed after |
| enabled device |
| |
| commit 70054aa39a013fa52eff432f2223b8bd5c0048f8 upstream. |
| |
| For pci device, need to disable device when probe failed after enabled |
| device. |
| |
| Link: https://lore.kernel.org/r/1567818450-173315-1-git-send-email-chenxiang66@hisilicon.com |
| Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com> |
| Reviewed-by: John Garry <john.garry@huawei.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c |
| index 45a66048801b..ff6d4aa92421 100644 |
| --- a/drivers/scsi/megaraid.c |
| +++ b/drivers/scsi/megaraid.c |
| @@ -4183,11 +4183,11 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) |
| */ |
| if (pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ && |
| pdev->subsystem_device == 0xC000) |
| - return -ENODEV; |
| + goto out_disable_device; |
| /* Now check the magic signature byte */ |
| pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic); |
| if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE) |
| - return -ENODEV; |
| + goto out_disable_device; |
| /* Ok it is probably a megaraid */ |
| } |
| |
| -- |
| 2.7.4 |
| |
