Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / NCR5380.c

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 777b0222d0214441fcd3a610ad5d2b39931147de..90ea0f5d9bdbbfc78da0b474a1490b184f3bde25 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1908,8 +1908,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                                switch (extended_msg[2]) {
                                                case EXTENDED_SDTR:
                                                case EXTENDED_WDTR:
-                                               case EXTENDED_MODIFY_DATA_POINTER:
-                                               case EXTENDED_EXTENDED_IDENTIFY:
                                                        tmp = 0;
                                                }
                                        } else if (len) {
@@ -1932,18 +1930,14 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                         * reject it.
                                         */
                                default:
-                                       if (!tmp) {
-                                               shost_printk(KERN_ERR, instance, "rejecting message ");
-                                               spi_print_msg(extended_msg);
-                                               printk("\n");
-                                       } else if (tmp != EXTENDED_MESSAGE)
-                                               scmd_printk(KERN_INFO, cmd,
-                                                           "rejecting unknown message %02x\n",
-                                                           tmp);
-                                       else
+                                       if (tmp == EXTENDED_MESSAGE)
                                                scmd_printk(KERN_INFO, cmd,
                                                            "rejecting unknown extended message code %02x, length %d\n",
-                                                           extended_msg[1], extended_msg[0]);
+                                                           extended_msg[2], extended_msg[1]);
+                                       else if (tmp)
+                                               scmd_printk(KERN_INFO, cmd,
+                                                           "rejecting unknown message code %02x\n",
+                                                           tmp);
 
                                        msgout = MESSAGE_REJECT;
                                        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);