diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2011-12-06 07:39:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-11 07:47:37 -0500 |
commit | 4be9c8fb58e48cd0110bd9504b0af1e18fa54467 (patch) | |
tree | 9a9265014378e77e9802398be24d2e5a499f4181 /drivers/media/video/tm6000 | |
parent | 875f0e3da1e88f166940cbb5e530b05eb64ccc1f (diff) |
[media] tm6000: Fix check for interrupt endpoint
Checking for &dev->int_in is useless because it returns the address of
the embedded struct tm6000_endpoint, which will always be positive and
therefore true.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tm6000')
-rw-r--r-- | drivers/media/video/tm6000/tm6000-input.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tm6000/tm6000-video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tm6000/tm6000-input.c b/drivers/media/video/tm6000/tm6000-input.c index af4bcf5288a9..89e003c0cfed 100644 --- a/drivers/media/video/tm6000/tm6000-input.c +++ b/drivers/media/video/tm6000/tm6000-input.c | |||
@@ -426,7 +426,7 @@ int tm6000_ir_init(struct tm6000_core *dev) | |||
426 | rc->scanmask = 0xffff; | 426 | rc->scanmask = 0xffff; |
427 | rc->priv = ir; | 427 | rc->priv = ir; |
428 | rc->change_protocol = tm6000_ir_change_protocol; | 428 | rc->change_protocol = tm6000_ir_change_protocol; |
429 | if (&dev->int_in) { | 429 | if (dev->int_in.endp) { |
430 | rc->open = __tm6000_ir_int_start; | 430 | rc->open = __tm6000_ir_int_start; |
431 | rc->close = __tm6000_ir_int_stop; | 431 | rc->close = __tm6000_ir_int_stop; |
432 | INIT_DELAYED_WORK(&ir->work, tm6000_ir_int_work); | 432 | INIT_DELAYED_WORK(&ir->work, tm6000_ir_int_work); |
diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c index 7ce967bf01ec..bc13db736e24 100644 --- a/drivers/media/video/tm6000/tm6000-video.c +++ b/drivers/media/video/tm6000/tm6000-video.c | |||
@@ -1612,7 +1612,7 @@ static int tm6000_release(struct file *file) | |||
1612 | 1612 | ||
1613 | usb_reset_configuration(dev->udev); | 1613 | usb_reset_configuration(dev->udev); |
1614 | 1614 | ||
1615 | if (&dev->int_in) | 1615 | if (dev->int_in.endp) |
1616 | usb_set_interface(dev->udev, | 1616 | usb_set_interface(dev->udev, |
1617 | dev->isoc_in.bInterfaceNumber, 2); | 1617 | dev->isoc_in.bInterfaceNumber, 2); |
1618 | else | 1618 | else |