Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index b31faeccb9cd..867f6fd5c2c0 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1278,7 +1278,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
                         error = 0;
                         /* Check for command packet errors */
                         if (full_command_packet->command.newcommand.status != 0) {
-                                if (tw_dev->srb[request_id] != 0) {
+                                if (tw_dev->srb[request_id] != NULL) {
                                         error = twa_fill_sense(tw_dev, request_id, 1, 1);
                                 } else {
                                         /* Skip ioctl error prints */
@@ -1290,7 +1290,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
 
                         /* Check for correct state */
                         if (tw_dev->state[request_id] != TW_S_POSTED) {
-                                if (tw_dev->srb[request_id] != 0) {
+                                if (tw_dev->srb[request_id] != NULL) {
                                         TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Received a request id that wasn't posted");
                                         TW_CLEAR_ALL_INTERRUPTS(tw_dev);
                                         goto twa_interrupt_bail;
@@ -1298,7 +1298,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
                         }
 
                         /* Check for internal command completion */
-                        if (tw_dev->srb[request_id] == 0) {
+                        if (tw_dev->srb[request_id] == NULL) {
                                 if (request_id != tw_dev->chrdev_request_id) {
                                         if (twa_aen_complete(tw_dev, request_id))
                                                 TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1b, "Error completing AEN during attention interrupt");