[PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile

This lets us remove a lot of code in the drivers that were all checking
the same thing.  It also found some bugs in a few of the drivers, which
has been fixed up.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index 5b8d65f62abf..a32cfe51b77d 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -160,7 +160,8 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
          * though so it's not too big a deal
          */
         if (dev->data.pos >= dev->data.len) {
-                dev_dbg(&dev->udev, "%s - Error ran out of data. pos: %d, len: %d\n",
+                dev_dbg(&dev->udev->dev,
+                        "%s - Error ran out of data. pos: %d, len: %d\n",
                         __FUNCTION__, dev->data.pos, dev->data.len);
                 return -1;
         }
@@ -306,7 +307,7 @@ static void keyspan_check_data(struct usb_keyspan *remote, struct pt_regs *regs)
                         err("Bad message recieved, no stop bit found.\n");
                 }
 
-                dev_dbg(&remote->udev,
+                dev_dbg(&remote->udev->dev,
                         "%s found valid message: system: %d, button: %d, toggle: %d\n",
                         __FUNCTION__, message.system, message.button, message.toggle);