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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
  [SCSI] fusion: fix domain validation loops
  [SCSI] qla2xxx: fix regression on sparc64
  [SCSI] modalias for scsi devices
  [SCSI] sg: cap reserved_size values at max_sectors
  [SCSI] BusLogic: stop using check_region
  [SCSI] tgt: fix rdma transfer bugs
  [SCSI] aacraid: fix aacraid not finding device
  [SCSI] aacraid: Correct SMC products in aacraid.txt
  [SCSI] scsi_error.c: Add EH Start Unit retry
  [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
  [SCSI] ipr: Driver version to 2.3.2
  [SCSI] ipr: Faster sg list fetch
  [SCSI] ipr: Return better qc_issue errors
  [SCSI] ipr: Disrupt device error
  [SCSI] ipr: Improve async error logging level control
  [SCSI] ipr: PCI unblock config access fix
  [SCSI] ipr: Fix for oops following SATA request sense
  [SCSI] ipr: Log error for SAS dual path switch
  [SCSI] ipr: Enable logging of debug error data for all devices
  [SCSI] ipr: Add new PCI-E IDs to device table
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 6335830df810..5631c199a8eb 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -224,8 +224,7 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
         struct srp_direct_buf *md = NULL;
         struct scatterlist dummy, *sg = NULL;
         dma_addr_t token = 0;
-        long err;
-        unsigned int done = 0;
+        int err = 0;
         int nmd, nsg = 0, len;
 
         if (dma_map || ext_desc) {
@@ -257,8 +256,8 @@ static int srp_indirect_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
                 sg_dma_address(&dummy) = token;
                 err = rdma_io(sc, &dummy, 1, &id->table_desc, 1, DMA_TO_DEVICE,
                               id->table_desc.len);
-                if (err < 0) {
-                        eprintk("Error copying indirect table %ld\n", err);
+                if (err) {
+                        eprintk("Error copying indirect table %d\n", err);
                         goto free_mem;
                 }
         } else {
@@ -271,6 +270,7 @@ rdma:
                 nsg = dma_map_sg(iue->target->dev, sg, sc->use_sg, DMA_BIDIRECTIONAL);
                 if (!nsg) {
                         eprintk("fail to map %p %d\n", iue, sc->use_sg);
+                        err = -EIO;
                         goto free_mem;
                 }
                 len = min(sc->request_bufflen, id->len);
@@ -286,7 +286,7 @@ free_mem:
         if (token && dma_map)
                 dma_free_coherent(iue->target->dev, id->table_desc.len, md, token);
 
-        return done;
+        return err;
 }
 
 static int data_out_desc_size(struct srp_cmd *cmd)
@@ -351,7 +351,7 @@ int srp_transfer_data(struct scsi_cmnd *sc, struct srp_cmd *cmd,
                 break;
         default:
                 eprintk("Unknown format %d %x\n", dir, format);
-                break;
+                err = -EINVAL;
         }
 
         return err;