Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320048
b: refs/heads/master
c: 3e9e0ca
h: refs/heads/master
v: v3
  • Loading branch information
Peter Senna Tschudin authored and Mauro Carvalho Chehab committed Jun 21, 2012
1 parent 9dd434e commit 5bf0811
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 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: 503d19495673583cd5a60cbe1d92317c7b9b7b65
refs/heads/master: 3e9e0ca227ea905b0d07f777c5316f44638428bf
14 changes: 0 additions & 14 deletions trunk/drivers/media/video/saa7164/saa7164-api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,6 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
struct saa7164_dev *dev = bus->dev;
u16 len = 0;
int unitid;
u32 regval;
u8 buf[256];
int ret;

Expand All @@ -1376,19 +1375,6 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
if (reglen > 4)
return -EIO;

if (reglen == 1)
regval = *(reg);
else
if (reglen == 2)
regval = ((*(reg) << 8) || *(reg+1));
else
if (reglen == 3)
regval = ((*(reg) << 16) | (*(reg+1) << 8) | *(reg+2));
else
if (reglen == 4)
regval = ((*(reg) << 24) | (*(reg+1) << 16) |
(*(reg+2) << 8) | *(reg+3));

/* Prepare the send buffer */
/* Bytes 00-03 source register length
* 04-07 source bytes to read
Expand Down

0 comments on commit 5bf0811

Please sign in to comment.