* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits) [media] gspca - sunplus: Fix some warnings and simplify code [media] gspca: Fix some warnings tied to 'no debug' [media] gspca: Unset debug by default [media] gspca - cpia1: Remove a bad conditional compilation instruction [media] gspca - main: Remove USB traces [media] gspca - main: Version change to 2.13 [media] gspca - stk014 / t613: Accept the index 0 in querymenu [media] gspca - kinect: Remove __devinitdata [media] gspca - cpia1: Fix some warnings [media] video/Kconfig: Fix mis-classified devices [media] support for medion dvb stick 1660:1921 [media] tm6000: fix uninitialized field, change prink to dprintk [media] cx231xx: Add support for Iconbit U100 [media] saa7134 add new TV cards [media] Use a more consistent value for RC repeat period [media] cx18: Move spinlock and vb_type initialisation into stream_init [media] tm6000: remove tm6010 sif audio start and stop [media] tm6000: remove unused exports [media] tm6000: add pts logging [media] tm6000: change from ioctl to unlocked_ioctl ...
Showing the changes to drivers/staging/lirc (1 of 228 files). Show all
Unified · Split
| @@ -570,6 +570,7 @@ static void incoming_packet(struct sasem_context *context, · 569 unmodified lines | ||
| 570 | 570 | unsigned char *buf = urb->transfer_buffer; |
| 571 | 571 | long ms; |
| 572 | 572 | struct timeval tv; |
| 573 | + int i; | |
| 573 | 574 | |
| 574 | 575 | if (len != 8) { |
| 575 | 576 | printk(KERN_WARNING "%s: invalid incoming packet size (%d)\n", |
| @@ -577,12 +578,12 @@ static void incoming_packet(struct sasem_context *context, · 1 unmodified line | ||
| 577 | 578 | return; |
| 578 | 579 | } |
| 579 | 580 | |
| 580 | −#ifdef DEBUG | |
| 581 | − int i; | |
| 582 | − for (i = 0; i < 8; ++i) | |
| 583 | − printk(KERN_INFO "%02x ", buf[i]); | |
| 584 | − printk(KERN_INFO "\n"); | |
| 585 | −#endif | |
| 581 | + if (debug) { | |
| 582 | + printk(KERN_INFO "Incoming data: "); | |
| 583 | + for (i = 0; i < 8; ++i) | |
| 584 | + printk(KERN_CONT "%02x ", buf[i]); | |
| 585 | + printk(KERN_CONT "\n"); | |
| 586 | + } | |
| 586 | 587 | |
| 587 | 588 | /* |
| 588 | 589 | * Lirc could deal with the repeat code, but we really need to block it |