Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202074
b: refs/heads/master
c: 15ceb6b
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare authored and Mauro Carvalho Chehab committed Aug 2, 2010
1 parent 617f832 commit 817722b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 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: 7d7b5284d710f42f4c0c0d376d9a6af544c39afd
refs/heads/master: 15ceb6b1c30ea40bdbe6a6246e2468d9bab375f5
1 change: 1 addition & 0 deletions trunk/drivers/media/video/cx88/cx88-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -3498,6 +3498,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
}

cx88_card_setup(core);
cx88_i2c_init_ir(core);
cx88_ir_init(core, pci);

return core;
Expand Down
6 changes: 5 additions & 1 deletion trunk/drivers/media/video/cx88/cx88-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
} else
printk("%s: i2c register FAILED\n", core->name);

return core->i2c_rc;
}

void cx88_i2c_init_ir(struct cx88_core *core)
{
/* Instantiate the IR receiver device, if present */
if (0 == core->i2c_rc) {
struct i2c_board_info info;
Expand All @@ -207,7 +212,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
}
}
}
return core->i2c_rc;
}

/* ----------------------------------------------------------------------- */
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/cx88/cx88.h
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ extern struct videobuf_queue_ops cx8800_vbi_qops;
/* cx88-i2c.c */

extern int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci);
extern void cx88_i2c_init_ir(struct cx88_core *core);


/* ----------------------------------------------------------- */
Expand Down

0 comments on commit 817722b

Please sign in to comment.