Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320645
b: refs/heads/master
c: ddebe8c
h: refs/heads/master
i:
  320643: d42bb3b
v: v3
  • Loading branch information
Ezequiel García authored and Mauro Carvalho Chehab committed Jul 30, 2012
1 parent 0a5eafa commit 6451454
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 5a6fa3fe9a465d1c5e1e6bf8a4ad1ca9063131a5
refs/heads/master: ddebe8cdd6c8d5f937c6587d2636079a5d096247
7 changes: 2 additions & 5 deletions trunk/drivers/media/video/saa7164/saa7164-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,8 @@ int saa7164_i2c_register(struct saa7164_i2c *bus)

dprintk(DBGLVL_I2C, "%s(bus = %d)\n", __func__, bus->nr);

memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template,
sizeof(bus->i2c_adap));

memcpy(&bus->i2c_client, &saa7164_i2c_client_template,
sizeof(bus->i2c_client));
bus->i2c_adap = saa7164_i2c_adap_template;
bus->i2c_client = saa7164_i2c_client_template;

bus->i2c_adap.dev.parent = &dev->pci->dev;

Expand Down

0 comments on commit 6451454

Please sign in to comment.