Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / s390 / scsi / zfcp_qdio.c

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 81daa8204bfeeda745cedd8838093b52a40d850e..c6899efdc8f66fd8633ec03b38993b43762dd86b 100644 (file)
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -640,13 +640,9 @@ int
 zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req,
                              unsigned long sbtype, struct scsi_cmnd *scsi_cmnd)
 {
-       if (scsi_sg_count(scsi_cmnd))
-               return zfcp_qdio_sbals_from_sg(fsf_req, sbtype,
-                                              scsi_sglist(scsi_cmnd),
-                                              scsi_sg_count(scsi_cmnd),
-                                              ZFCP_MAX_SBALS_PER_REQ);
-       else
-               return 0;
+       return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, scsi_sglist(scsi_cmnd),
+                                      scsi_sg_count(scsi_cmnd),
+                                      ZFCP_MAX_SBALS_PER_REQ);
 }
 
 /**