diff --git a/[refs] b/[refs] index 9b7ff5d8caed..a9b5651cbe6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 078a68c11fe0580a23754fac25a6d9896719278e +refs/heads/master: c00ecc97bc638919ff35117290b4fab01354e8d7 diff --git a/trunk/drivers/media/video/tm6000/tm6000-core.c b/trunk/drivers/media/video/tm6000/tm6000-core.c index 55d097eaadd8..5d7d045c652b 100644 --- a/trunk/drivers/media/video/tm6000/tm6000-core.c +++ b/trunk/drivers/media/video/tm6000/tm6000-core.c @@ -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,