From cc6cb365f7a6876a3416ca147dc0e32ee12de800 Mon Sep 17 00:00:00 2001 From: Richard Lary Date: Thu, 18 Feb 2010 10:07:29 -0800 Subject: [PATCH] --- yaml --- r: 181391 b: refs/heads/master c: 8c1496bda8aeeafd78ecf0c25c060b601e58dedf h: refs/heads/master i: 181389: af3cba5a8428782b439557c43ee92d7daf1016c0 181387: 09a9890e31585175cdfd86cec978f4d90bedc48e 181383: 5105f49793e9d3c42ed0de70fb86c89f1065a4de 181375: c49625dcb74aa803581233a48c05f5b96d4b3492 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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