From 4da60dd205be6581b5f197e70dbeadcc7ad3b5e5 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 4 Nov 2011 21:25:01 +0300
Subject: [PATCH] --- yaml --- r: 275527 b: refs/heads/master c:
 181a9d795ab763b03b15f73402691abde98d1803 h: refs/heads/master i:   275525:
 3a567bf0213ea8cface4fbdacbd79af5649fe4be   275523:
 467f75d4092fab0823d32d06338065cbd73b63b4   275519:
 1587fc94fd579a5952a4b8b028ca040fb85a0a8f v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c5acd16028bf..e6d25a0f14e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 745718132c3c7cac98a622b610e239dcd5217f71
+refs/heads/master: 181a9d795ab763b03b15f73402691abde98d1803
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 8889b1babcac..4e041f6d808c 100644
--- a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -2802,6 +2802,11 @@ _scsih_error_recovery_delete_devices(struct MPT2SAS_ADAPTER *ioc)
 
 	if (ioc->is_driver_loading)
 		return;
+
+	fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC);
+	if (!fw_event)
+		return;
+
 	fw_event->event = MPT2SAS_REMOVE_UNRESPONDING_DEVICES;
 	fw_event->ioc = ioc;
 	_scsih_fw_event_add(ioc, fw_event);