Commit 70054aa3 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen

scsi: megaraid: disable device when probe failed after enabled device

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.comSigned-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0ed88102
...@@ -4183,11 +4183,11 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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 && if (pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ &&
pdev->subsystem_device == 0xC000) pdev->subsystem_device == 0xC000)
return -ENODEV; goto out_disable_device;
/* Now check the magic signature byte */ /* Now check the magic signature byte */
pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic); pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic);
if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE) if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE)
return -ENODEV; goto out_disable_device;
/* Ok it is probably a megaraid */ /* Ok it is probably a megaraid */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment