From 7a4a7c784721319f12ef5767bfbd85690b666e98 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Sat, 28 Jul 2007 01:13:33 +0200
Subject: [PATCH] --- yaml --- r: 63143 b: refs/heads/master c:
 92631fa4d0afa64b82144eab714fbf2f4049dabe h: refs/heads/master i:   63141:
 15c3211ed0eea45691419084c1295dacf5aae0d5   63139:
 13bf242e587a4ea4c179c7bb4aaa5497135e5d0b   63135:
 a57a9686b04d22651e7b8bd19952478d9e6e826f v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/scsi/libsas/sas_expander.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 12bbaf55411a..020ed54ceac2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb
+refs/heads/master: 92631fa4d0afa64b82144eab714fbf2f4049dabe
diff --git a/trunk/drivers/scsi/libsas/sas_expander.c b/trunk/drivers/scsi/libsas/sas_expander.c
index 8603ae65213d..8727436b222d 100644
--- a/trunk/drivers/scsi/libsas/sas_expander.c
+++ b/trunk/drivers/scsi/libsas/sas_expander.c
@@ -507,14 +507,21 @@ static int sas_dev_present_in_domain(struct asd_sas_port *port,
 int sas_smp_get_phy_events(struct sas_phy *phy)
 {
 	int res;
+	u8 *req;
+	u8 *resp;
 	struct sas_rphy *rphy = dev_to_rphy(phy->dev.parent);
 	struct domain_device *dev = sas_find_dev_by_rphy(rphy);
-	u8 *req = alloc_smp_req(RPEL_REQ_SIZE);
-	u8 *resp = kzalloc(RPEL_RESP_SIZE, GFP_KERNEL);
 
-	if (!resp)
+	req = alloc_smp_req(RPEL_REQ_SIZE);
+	if (!req)
 		return -ENOMEM;
 
+	resp = alloc_smp_resp(RPEL_RESP_SIZE);
+	if (!resp) {
+		kfree(req);
+		return -ENOMEM;
+	}
+
 	req[1] = SMP_REPORT_PHY_ERR_LOG;
 	req[9] = phy->number;