Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8184
b: refs/heads/master
c: 67e49a1
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Sep 9, 2005
1 parent 6e833d6 commit b9336ab
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5129b1589883d6eaa54886f3e0c5d918dafe329e
refs/heads/master: 67e49a1abe3e9458c7ffba66775b350b5ceffae0
1 change: 1 addition & 0 deletions trunk/drivers/media/video/cx88/cx88-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
ir->input.id.vendor = pci->vendor;
ir->input.id.product = pci->device;
}
ir->input.dev = &pci->dev;

/* record handles to ourself */
ir->core = core;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/ir-kbd-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ static int ir_probe(struct device *dev)
ir->input.id.vendor = sub->core->pci->vendor;
ir->input.id.product = sub->core->pci->device;
}
ir->input.dev = &sub->core->pci->dev;

if (ir->polling) {
INIT_WORK(&ir->work, ir_work, ir);
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/saa7134/saa7134-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
ir->dev.id.vendor = dev->pci->vendor;
ir->dev.id.product = dev->pci->device;
}
ir->dev.dev = &dev->pci->dev;

/* all done */
dev->remote = ir;
Expand Down

0 comments on commit b9336ab

Please sign in to comment.