diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-05 16:47:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-05 16:47:30 -0700 |
| commit | 01bbefb29bd8f474f7fbee571c84e1f6fc86e9ba (patch) | |
| tree | b6bdb0c56a5877c2620cb39e31d321a38b4d1660 /usb-adutux-remove-custom-debug-macro-and-module-parameter.patch | |
| parent | a8127a134c4991d2173ec65d03d153c1782c8762 (diff) | |
| download | patches-01bbefb29bd8f474f7fbee571c84e1f6fc86e9ba.tar.gz | |
updates
Diffstat (limited to 'usb-adutux-remove-custom-debug-macro-and-module-parameter.patch')
| -rw-r--r-- | usb-adutux-remove-custom-debug-macro-and-module-parameter.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch b/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch index 902e4fb2eee2d5..5677c3185c92f4 100644 --- a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch +++ b/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +++ b/drivers/usb/misc/adutux.c @@ -27,30 +27,11 @@ #include <linux/mutex.h> - #include <asm/uaccess.h> + #include <linux/uaccess.h> -#ifdef CONFIG_USB_DEBUG -static int debug = 5; @@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - -/* Use our own dbg macro */ -#undef dbg --#define dbg(lvl, format, arg...) \ --do { \ +-#define dbg(lvl, format, arg...) \ +-do { \ - if (debug >= lvl) \ - printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ -} while (0) @@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> struct adu_device *dev = urb->context; int status = urb->status; -- adu_debug_data(5,__func__, urb->actual_length, urb->transfer_buffer); +- adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); + adu_debug_data(&dev->udev->dev, __func__, + urb->actual_length, urb->transfer_buffer); |