From 5b53ccf8911b6e68ac80bdc72f2fd1c2d5a47543 Mon Sep 17 00:00:00 2001 From: "mike.miller@hp.com" Date: Wed, 13 Dec 2006 13:10:04 +0100 Subject: [PATCH] --- yaml --- r: 44548 b: refs/heads/master c: c4977f596c5bce4d20fbd22cdb03486112985622 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3ffa13a6bd53..1ba39faeec83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98040015bc5d6cea3bd2dcb642fe1e8c4bded8e1 +refs/heads/master: c4977f596c5bce4d20fbd22cdb03486112985622 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 8879e95b121e..335e218b6dcc 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -3006,10 +3006,8 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) err_out_free_res: pci_release_regions(pdev); - - err_out_disable_pdev: - pci_disable_device(pdev); return err; + } /* @@ -3383,7 +3381,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, blk_cleanup_queue(drv->queue); } pci_release_regions(pdev); - pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); free_hba(i); return -1; @@ -3453,7 +3450,6 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) kfree(hba[i]->scsi_rejects.complete); #endif pci_release_regions(pdev); - pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); free_hba(i); }