[SCSI] scsi_dh: suppress comparison warning

[linux-2.6-omap-h63xx.git] / drivers / scsi / device_handler / scsi_dh_emc.c

diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index b9d23e9e9a44dff3ba612bd90f3fbcb3db4a1392..8f45570a8a01ca3d1943117e944e57d08d407789 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -84,7 +84,7 @@ struct clariion_dh_data {
        /*
         * I/O buffer for both MODE_SELECT and INQUIRY commands.
         */
-       char buffer[CLARIION_BUFFER_SIZE];
+       unsigned char buffer[CLARIION_BUFFER_SIZE];
        /*
         * SCSI sense buffer for commands -- assumes serial issuance
         * and completion sequence of all commands for same multipath.
@@ -176,7 +176,7 @@ static int parse_sp_info_reply(struct scsi_device *sdev,
                err = SCSI_DH_DEV_TEMP_BUSY;
                goto out;
        }
-       if (csdev->buffer[4] < 0 || csdev->buffer[4] > 2) {
+       if (csdev->buffer[4] > 2) {
                /* Invalid buffer format */
                sdev_printk(KERN_NOTICE, sdev,
                            "%s: invalid VPD page 0xC0 format\n",
@@ -278,7 +278,6 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,
                return NULL;
        }
 
-       memset(rq->cmd, 0, BLK_MAX_CDB);
        rq->cmd_len = COMMAND_SIZE(cmd);
        rq->cmd[0] = cmd;
 
@@ -439,7 +438,7 @@ static int clariion_check_sense(struct scsi_device *sdev,
                         * Unit Attention Code. This is the first IO
                         * to the new path, so just retry.
                         */
-                       return NEEDS_RETRY;
+                       return ADD_TO_MLQUEUE;
                break;
        }
 
@@ -514,7 +513,7 @@ retry:
                        return SCSI_DH_IO;
 
                err = clariion_check_sense(sdev, &sshdr);
-               if (retry > 0 && err == NEEDS_RETRY) {
+               if (retry > 0 && err == ADD_TO_MLQUEUE) {
                        retry--;
                        goto retry;
                }