diff --git a/[refs] b/[refs] index d8fcb0f7ee9e..b98386b0422b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 721f507b694f3be7c872d63a323afde91e43dfff +refs/heads/master: edecce0a31b4447ee75dd0df34c7c5fc90ba6f6b diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c index c56750338dd1..d467326b8692 100644 --- a/trunk/drivers/staging/tm6000/tm6000-core.c +++ b/trunk/drivers/staging/tm6000/tm6000-core.c @@ -51,8 +51,7 @@ int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req, memcpy(data, buf, len); } -// if (tm6000_debug & V4L2_DEBUG_I2C) { -if(1){ + if (tm6000_debug & V4L2_DEBUG_I2C) { if (!ini) last=ini=jiffies; @@ -82,8 +81,7 @@ if(1){ if (req_type & USB_DIR_IN) memcpy(buf, data, len); -// if (tm6000_debug & V4L2_DEBUG_I2C) { -if(1) { + if (tm6000_debug & V4L2_DEBUG_I2C) { if (ret<0) { if (req_type & USB_DIR_IN) printk("<<< (len=%d)\n",len);