Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 226370
b: refs/heads/master
c: fe04164
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 1e1a3cc commit fd4e35f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 50155c25bf346b65fec8e215131df397b0a5ee6e
refs/heads/master: fe04164647588ec55937e6d696da1ebeca04d000
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/cx231xx/cx231xx-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ int cx231xx_read_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1566,7 +1566,7 @@ int cx231xx_write_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1600,7 +1600,7 @@ int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1641,7 +1641,7 @@ int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down

0 comments on commit fd4e35f

Please sign in to comment.