Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285326
b: refs/heads/master
c: c00ecc9
h: refs/heads/master
v: v3
  • Loading branch information
Stefan Ringel authored and Mauro Carvalho Chehab committed Nov 28, 2011
1 parent 98d0c4c commit f0816a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 078a68c11fe0580a23754fac25a6d9896719278e
refs/heads/master: c00ecc97bc638919ff35117290b4fab01354e8d7
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/tm6000/tm6000-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ int tm6000_set_reg_mask(struct tm6000_core *dev, u8 req, u16 value,
u8 new_index;

rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR, req,
value, index, buf, 1);
value, 0, buf, 1);

if (rc < 0)
return rc;

new_index = (buf[0] & ~mask) | (index & mask);

if (new_index == index)
if (new_index == buf[0])
return 0;

return tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR,
Expand Down

0 comments on commit f0816a5

Please sign in to comment.