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

[cascardo/linux.git] / drivers / scsi / arm / acornscsi.c

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index d89b9b4..deaaf84 100644 (file)
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -850,13 +850,13 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
                        break;
 
                    default:
-                       printk(KERN_ERR "scsi%d.H: incomplete data transfer detected: result=%08X command=",
-                               host->host->host_no, SCpnt->result);
-                       __scsi_print_command(SCpnt->cmnd);
+                       scmd_printk(KERN_ERR, SCpnt,
+                                   "incomplete data transfer detected: "
+                                   "result=%08X", SCpnt->result);
+                       scsi_print_command(SCpnt);
                        acornscsi_dumpdma(host, "done");
-                       acornscsi_dumplog(host, SCpnt->device->id);
-                       SCpnt->result &= 0xffff;
-                       SCpnt->result |= DID_ERROR << 16;
+                       acornscsi_dumplog(host, SCpnt->device->id);
+                       set_host_byte(SCpnt, DID_ERROR);
                    }
                }
        }