diff --git a/[refs] b/[refs]
index 0d389309ab74..bc4debcc7047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e71f9c848e669f003b1319da52f03cb8e7d7403
+refs/heads/master: 61808c2bbba127ecd9786401c55ea4c394aa0240
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index cf39cf9aac25..e29b8926f80e 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3268,8 +3268,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 	unregister_blkdev(hba[i]->major, hba[i]->devname);
 clean1:
 	release_io_mem(hba[i]);
-	free_hba(i);
 	hba[i]->busy_initializing = 0;
+	free_hba(i);
 	return(-1);
 }