This commit was generated by cvs2svn to compensate for changes in r517,

[linux-2.6.git] / drivers / usb / image / microtek.c

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 19acf62..9d3aa30 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -136,7 +136,7 @@
 #include <asm/atomic.h>
 #include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "microtek.h"
 
@@ -214,8 +214,8 @@ static struct usb_driver mts_usb_driver = {
 #ifdef MTS_DO_DEBUG
 
 static inline void mts_debug_dump(struct mts_desc* desc) {
-       MTS_DEBUG("desc at 0x%x: halted = %02x%02x, toggle = %02x%02x\n",
-                 (int)desc,(int)desc->usb_dev->halted[1],(int)desc->usb_dev->halted[0],
+       MTS_DEBUG("desc at 0x%x: toggle = %02x%02x\n",
+                 (int)desc,
                  (int)desc->usb_dev->toggle[1],(int)desc->usb_dev->toggle[0]
                );
        MTS_DEBUG("ep_out=%x ep_response=%x ep_image=%x\n",
@@ -534,7 +534,7 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )
 
        if (!srb->use_sg) {
                if ( !srb->bufflen ){
-                       desc->context.data = 0;
+                       desc->context.data = NULL;
                        desc->context.data_length = 0;
                        return;
                } else {