2005-04-19 13:00:49

by Barry K. Nathan

[permalink] [raw]
Subject: [PATCH] fix ultrastor.c compile error

This is against linux-2.6 head 9d469ee9f21c680c41dbffe5b0f36ab5010ca8b1:

CC [M] drivers/scsi/ultrastor.o
drivers/scsi/ultrastor.c: In function `ultrastor_queuecommand':
drivers/scsi/ultrastor.c:302: warning: matching constraint does not
allow a register
drivers/scsi/ultrastor.c:302: warning: matching constraint does not
allow a register
drivers/scsi/ultrastor.c: In function `ultrastor_abort':
drivers/scsi/ultrastor.c:948: error: `FAILURE' undeclared (first use in
this function)
drivers/scsi/ultrastor.c:948: error: (Each undeclared identifier is
reported only once
drivers/scsi/ultrastor.c:948: error: for each function it appears in.)
make[2]: *** [drivers/scsi/ultrastor.o] Error 1
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2

This patch fixes the compile error, but not the warning. I have
compile-tested this patch but I do not have the hardware so I don't
believe I can execute this code.

Signed-off-by: Barry K. Nathan <[email protected]>

--- linux-2.6.12-rc2-9d469ee9f21c680c41dbffe5b0f36ab5010ca8b1-bkn1/drivers/scsi/ultrastor.c 2005-04-19 00:46:13.689904927 -0700
+++ linux-2.6.12-rc2-9d469ee9f21c680c41dbffe5b0f36ab5010ca8b1-bkn2/drivers/scsi/ultrastor.c 2005-04-19 05:56:12.135432363 -0700
@@ -945,7 +945,7 @@
config.mscp[mscp_index].SCint, SCpnt);
#endif
if (config.mscp[mscp_index].SCint == 0)
- return FAILURE;
+ return FAILED;

if (config.mscp[mscp_index].SCint != SCpnt) panic("Bad abort");
config.mscp[mscp_index].SCint = NULL;