diff --git a/[refs] b/[refs] index 262c89b96e30..aaba1b49d9b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae97c91eb1f139b19c1e7cbc5c1380dae8ad874e +refs/heads/master: 8c1496bda8aeeafd78ecf0c25c060b601e58dedf diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index a1aef661108b..46720b23028f 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -3362,6 +3362,11 @@ qla2xxx_pci_slot_reset(struct pci_dev *pdev) pci_restore_state(pdev); + /* pci_restore_state() clears the saved_state flag of the device + * save restored state which resets saved_state flag + */ + pci_save_state(pdev); + if (ha->mem_only) rc = pci_enable_device_mem(pdev); else