diff --git a/[refs] b/[refs]
index 70ccc5c6aa00..c517d618e84e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec52d5f1cb9a1a0db02143fdcc6004749ea19e0b
+refs/heads/master: 063d2cf72ab6101d2dd69bd6fb503b229be70325
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 865484e40841..9528e94dc8b2 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4673,8 +4673,14 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev)
 		use_doorbell = DOORBELL_CTLR_RESET2;
 	} else {
 		use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
-		if (use_doorbell)
-			use_doorbell = DOORBELL_CTLR_RESET;
+		if (use_doorbell) {
+			dev_warn(&pdev->dev, "Controller claims that "
+				"'Bit 2 doorbell reset' is "
+				"supported, but not 'bit 5 doorbell reset'.  "
+				"Firmware update is recommended.\n");
+			rc = -ENOTSUPP; /* use the soft reset */
+			goto unmap_cfgtable;
+		}
 	}
 
 	rc = cciss_controller_hard_reset(pdev, vaddr, use_doorbell);