Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / scsi / vmw_pvscsi.c

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 3bfaa66fa0d16d31610ee33ef41c9cce10031f1a..b9755ec0e8123cdd7a3479659fb2111924dc3056 100644 (file)
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -1405,7 +1405,6 @@ out_release_resources:
 out_free_host:
        scsi_host_put(host);
 out_disable_device:
-       pci_set_drvdata(pdev, NULL);
        pci_disable_device(pdev);
 
        return error;
@@ -1445,7 +1444,6 @@ static void pvscsi_remove(struct pci_dev *pdev)
 
        scsi_host_put(host);
 
-       pci_set_drvdata(pdev, NULL);
        pci_disable_device(pdev);
 }