diff --git a/[refs] b/[refs]
index c0abf07bbd32..7479ca8df970 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a1b7e575b80ceb19ea50bfa86ce0053ea57181d
+refs/heads/master: 1db90ea239b85479daedb978ea2f0a61776f074f
diff --git a/trunk/drivers/scsi/hptiop.c b/trunk/drivers/scsi/hptiop.c
index 645f7cdf21ab..0729f150b33a 100644
--- a/trunk/drivers/scsi/hptiop.c
+++ b/trunk/drivers/scsi/hptiop.c
@@ -1157,7 +1157,7 @@ static int __devinit hptiop_probe(struct pci_dev *pcidev,
 disable_pci_device:
 	pci_disable_device(pcidev);
 
-	dprintk("scsi%d: hptiop_probe fail\n", host->host_no);
+	dprintk("scsi%d: hptiop_probe fail\n", host ? host->host_no : 0);
 	return -ENODEV;
 }