Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202064
b: refs/heads/master
c: 02c7105
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Aug 2, 2010
1 parent 0423826 commit 5b8437e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d064f960650d64e2564cd505a6e40c4ac359b6f3
refs/heads/master: 02c71055e547e49d974153b46a30eba2cbc8a00c
16 changes: 8 additions & 8 deletions trunk/drivers/staging/tm6000/tm6000-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ MODULE_PARM_DESC(enable_ir, "enable ir (default is enable");

#undef dprintk

#define dprintk(fmt, arg... ) \
#define dprintk(fmt, arg...) \
if (ir_debug) { \
printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
}
Expand Down Expand Up @@ -119,13 +119,13 @@ static void tm6000_ir_urb_received(struct urb *urb)
struct tm6000_core *dev = urb->context;
struct tm6000_IR *ir = dev->ir;
int rc;

if (urb->status != 0)
printk(KERN_INFO "not ready\n");
else if (urb->actual_length > 0)
memcpy (ir->urb_data, urb->transfer_buffer, urb->actual_length);
memcpy(ir->urb_data, urb->transfer_buffer, urb->actual_length);

dprintk ("data %02x %02x %02x %02x\n", ir->urb_data[0],
dprintk("data %02x %02x %02x %02x\n", ir->urb_data[0],
ir->urb_data[1], ir->urb_data[2], ir->urb_data[3]);

ir->key = 1;
Expand All @@ -140,7 +140,7 @@ static int default_polling_getkey(struct tm6000_IR *ir,
int rc;
u8 buf[2];

if(ir->wait && !&dev->int_in) {
if (ir->wait && !&dev->int_in) {
poll_result->rc_data[0] = 0xff;
return 0;
}
Expand All @@ -159,10 +159,10 @@ static int default_polling_getkey(struct tm6000_IR *ir,

msleep(10);

dprintk ("read data=%02x\n", buf[0]);
if (rc < 0) {
dprintk("read data=%02x\n", buf[0]);
if (rc < 0)
return rc;
}

poll_result->rc_data[0] = buf[0];
}
return 0;
Expand Down

0 comments on commit 5b8437e

Please sign in to comment.