1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 7aad15436d24..92d1cb1b21cb 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -113,7 +113,7 @@ static const struct {
         unsigned char  asc;
         unsigned char  ascq;
         int            errno;
-} err[] = {
+} ch_err[] = {
 /* Just filled in what looks right. Hav'nt checked any standard paper for
    these errno assignments, so they may be wrong... */
         {
@@ -155,11 +155,11 @@ static int ch_find_errno(struct scsi_sense_hdr *sshdr)
         /* Check to see if additional sense information is available */
         if (scsi_sense_valid(sshdr) &&
             sshdr->asc != 0) {
-                for (i = 0; err[i].errno != 0; i++) {
-                        if (err[i].sense == sshdr->sense_key &&
-                            err[i].asc   == sshdr->asc &&
-                            err[i].ascq  == sshdr->ascq) {
-                                errno = -err[i].errno;
+                for (i = 0; ch_err[i].errno != 0; i++) {
+                        if (ch_err[i].sense == sshdr->sense_key &&
+                            ch_err[i].asc   == sshdr->asc &&
+                            ch_err[i].ascq  == sshdr->ascq) {
+                                errno = -ch_err[i].errno;
                                 break;
                         }
                 }
@@ -721,8 +721,8 @@ static long ch_ioctl(struct file *file,
         case CHIOGELEM:
         {
                 struct changer_get_element cge;
-                u_char  cmd[12];
-                u_char  *buffer;
+                u_char ch_cmd[12];
+                u_char *buffer;
                 unsigned int elem;
                 int     result,i;
 
@@ -739,17 +739,18 @@ static long ch_ioctl(struct file *file,
                 mutex_lock(&ch->lock);
 
         voltag_retry:
-                memset(cmd,0,sizeof(cmd));
-                cmd[0] = READ_ELEMENT_STATUS;
-                cmd[1] = (ch->device->lun << 5) |
+                memset(ch_cmd, 0, sizeof(ch_cmd));
+                ch_cmd[0] = READ_ELEMENT_STATUS;
+                ch_cmd[1] = (ch->device->lun << 5) |
                         (ch->voltags ? 0x10 : 0) |
                         ch_elem_to_typecode(ch,elem);
-                cmd[2] = (elem >> 8) & 0xff;
-                cmd[3] = elem        & 0xff;
-                cmd[5] = 1;
-                cmd[9] = 255;
+                ch_cmd[2] = (elem >> 8) & 0xff;
+                ch_cmd[3] = elem        & 0xff;
+                ch_cmd[5] = 1;
+                ch_cmd[9] = 255;
 
-                if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) {
+                result = ch_do_scsi(ch, ch_cmd, buffer, 256, DMA_FROM_DEVICE);
+                if (!result) {
                         cge.cge_status = buffer[18];
                         cge.cge_flags = 0;
                         if (buffer[18] & CESTATUS_EXCEPT) {