Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (28 commits)
  [SCSI] mpt fusion: Changes in mptctl.c for logging support
  [SCSI] mpt fusion: Changes in mptfc.c mptlan.c mptsas.c and mptspi.c for logging support
  [SCSI] mpt fusion: Changes in mptscsih.c for logging support
  [SCSI] mpt fusion: Changes in mptbase.c for logging support
  [SCSI] mpt fusion: logging support in Kconfig, Makefile, mptbase.h and addition of mptdebug.h
  [SCSI] libsas: Fix potential NULL dereference in sas_smp_get_phy_events()
  [SCSI] bsg: Fix build for CONFIG_BLOCK=n
  [SCSI] aacraid: fix Sunrise Lake reset handling
  [SCSI] aacraid: add SCSI SYNCHONIZE_CACHE range checking
  [SCSI] add easyRAID to the no report luns blacklist
  [SCSI] advansys: lindent and other large, uninteresting changes
  [SCSI] aic79xx, aic7xxx: Fix incorrect width setting
  [SCSI] qla2xxx: fix to honor ignored parameters in sysfs attributes
  [SCSI] aacraid: draw line in sand, sundry cleanup and version update
  [SCSI] iscsi_tcp: Turn off bounce buffers
  [SCSI] libiscsi: fix cmd seqeunce number checking
  [SCSI] iscsi_tcp, ib_iser Enable module refcounting for iscsi host template
  [SCSI] libiscsi: make sure session is not blocked when removing host
  [SCSI] libsas: Remove PCI dependencies
  [SCSI] simscsi: convert to use the data buffer accessors
  ...

1 files changed, 13 insertions, 5 deletions

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index b500f0c1449c..8727436b222d 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/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;
 
@@ -1879,7 +1886,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                     struct request *req)
 {
         struct domain_device *dev;
-        int ret, type = rphy->identify.device_type;
+        int ret, type;
         struct request *rsp = req->next_rq;
 
         if (!rsp) {
@@ -1888,12 +1895,13 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                 return -EINVAL;
         }
 
-        /* seems aic94xx doesn't support */
+        /* no rphy means no smp target support (ie aic94xx host) */
         if (!rphy) {
                 printk("%s: can we send a smp request to a host?\n",
                        __FUNCTION__);
                 return -EINVAL;
         }
+        type = rphy->identify.device_type;
 
         if (type != SAS_EDGE_EXPANDER_DEVICE &&
             type != SAS_FANOUT_EXPANDER_DEVICE) {