From b06b7231450305afdb2b5d84005e02ede12ce17a Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Wed, 28 Mar 2007 00:49:49 +0200 Subject: [PATCH] --- yaml --- r: 53675 b: refs/heads/master c: 665db93b8a5fc6a11e2ace6b20569420a353d037 h: refs/heads/master i: 53673: 25726d3eb5cb229b9662f4fc6fad558c41e1eba4 53671: 173973eb3791a95b57ed69140ef97e0b6bb42dab v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4c977e7166e..59fb8eec092e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dfb7cbef856689caebd0f498dbd140d1b79954f +refs/heads/master: 665db93b8a5fc6a11e2ace6b20569420a353d037 diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index b6c96a8e0337..b78919a318e2 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -1707,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev) scsi_host_put(ha->host); + pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); } @@ -1749,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha) if (ha->iobase) iounmap(ha->iobase); pci_release_regions(ha->pdev); - - pci_disable_device(ha->pdev); } static inline void