Commit b78bbc47 authored by James Bottomley's avatar James Bottomley

Fix up 3w-xxxx after NULL removal mismerge

Looks like there were also several other NULL<->0 replacements
necessary in the new code.
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent bf5c23f7
...@@ -607,7 +607,7 @@ static int tw_aen_read_queue(TW_Device_Extension *tw_dev, int request_id) ...@@ -607,7 +607,7 @@ static int tw_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
/* Now post the command packet */ /* Now post the command packet */
if ((status_reg_value & TW_STATUS_COMMAND_QUEUE_FULL) == 0) { if ((status_reg_value & TW_STATUS_COMMAND_QUEUE_FULL) == 0) {
dprintk(KERN_WARNING "3w-xxxx: tw_aen_read_queue(): Post succeeded.\n"); dprintk(KERN_WARNING "3w-xxxx: tw_aen_read_queue(): Post succeeded.\n");
tw_dev->srb[request_id] = 0; /* Flag internal command */ tw_dev->srb[request_id] = NULL; /* Flag internal command */
tw_dev->state[request_id] = TW_S_POSTED; tw_dev->state[request_id] = TW_S_POSTED;
outl(command_que_value, TW_COMMAND_QUEUE_REG_ADDR(tw_dev)); outl(command_que_value, TW_COMMAND_QUEUE_REG_ADDR(tw_dev));
} else { } else {
...@@ -2166,7 +2166,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance, ...@@ -2166,7 +2166,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance,
/* Check for bad response */ /* Check for bad response */
if (command_packet->status != 0) { if (command_packet->status != 0) {
/* If internal command, don't error, don't fill sense */ /* If internal command, don't error, don't fill sense */
if (tw_dev->srb[request_id] == 0) { if (tw_dev->srb[request_id] == NULL) {
tw_decode_sense(tw_dev, request_id, 0); tw_decode_sense(tw_dev, request_id, 0);
} else { } else {
error = tw_decode_sense(tw_dev, request_id, 1); error = tw_decode_sense(tw_dev, request_id, 1);
...@@ -2175,7 +2175,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance, ...@@ -2175,7 +2175,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance,
/* Check for correct state */ /* Check for correct state */
if (tw_dev->state[request_id] != TW_S_POSTED) { if (tw_dev->state[request_id] != TW_S_POSTED) {
if (tw_dev->srb[request_id] != 0) { if (tw_dev->srb[request_id] != NULL) {
printk(KERN_WARNING "3w-xxxx: scsi%d: Received a request id that wasn't posted.\n", tw_dev->host->host_no); printk(KERN_WARNING "3w-xxxx: scsi%d: Received a request id that wasn't posted.\n", tw_dev->host->host_no);
error = 1; error = 1;
} }
...@@ -2184,7 +2184,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance, ...@@ -2184,7 +2184,7 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance,
dprintk(KERN_NOTICE "3w-xxxx: tw_interrupt(): Response queue request id: %d.\n", request_id); dprintk(KERN_NOTICE "3w-xxxx: tw_interrupt(): Response queue request id: %d.\n", request_id);
/* Check for internal command completion */ /* Check for internal command completion */
if (tw_dev->srb[request_id] == 0) { if (tw_dev->srb[request_id] == NULL) {
dprintk(KERN_WARNING "3w-xxxx: tw_interrupt(): Found internally posted command.\n"); dprintk(KERN_WARNING "3w-xxxx: tw_interrupt(): Found internally posted command.\n");
/* Check for chrdev ioctl completion */ /* Check for chrdev ioctl completion */
if (request_id != tw_dev->chrdev_request_id) { if (request_id != tw_dev->chrdev_request_id) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment