aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha152x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/aha152x.c')
-rw-r--r--drivers/scsi/aha152x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index a09b2d3fdf5a..f5215fd4b73d 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -994,13 +994,13 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
994 SCpnt->SCp.sent_command = 0; 994 SCpnt->SCp.sent_command = 0;
995 995
996 if(SCpnt->SCp.phase & (resetting|check_condition)) { 996 if(SCpnt->SCp.phase & (resetting|check_condition)) {
997 if(SCpnt->host_scribble==0 || SCSEM(SCpnt) || SCNEXT(SCpnt)) { 997 if (!SCpnt->host_scribble || SCSEM(SCpnt) || SCNEXT(SCpnt)) {
998 printk(ERR_LEAD "cannot reuse command\n", CMDINFO(SCpnt)); 998 printk(ERR_LEAD "cannot reuse command\n", CMDINFO(SCpnt));
999 return FAILED; 999 return FAILED;
1000 } 1000 }
1001 } else { 1001 } else {
1002 SCpnt->host_scribble = kmalloc(sizeof(struct aha152x_scdata), GFP_ATOMIC); 1002 SCpnt->host_scribble = kmalloc(sizeof(struct aha152x_scdata), GFP_ATOMIC);
1003 if(SCpnt->host_scribble==0) { 1003 if(!SCpnt->host_scribble) {
1004 printk(ERR_LEAD "allocation failed\n", CMDINFO(SCpnt)); 1004 printk(ERR_LEAD "allocation failed\n", CMDINFO(SCpnt));
1005 return FAILED; 1005 return FAILED;
1006 } 1006 }
@@ -1162,7 +1162,7 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt)
1162 } 1162 }
1163 1163
1164 DO_LOCK(flags); 1164 DO_LOCK(flags);
1165 issued = remove_SC(&ISSUE_SC, SCpnt)==0; 1165 issued = remove_SC(&ISSUE_SC, SCpnt) == NULL;
1166 disconnected = issued && remove_SC(&DISCONNECTED_SC, SCpnt); 1166 disconnected = issued && remove_SC(&DISCONNECTED_SC, SCpnt);
1167 DO_UNLOCK(flags); 1167 DO_UNLOCK(flags);
1168 1168