From 4be9c8fb58e48cd0110bd9504b0af1e18fa54467 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Tue, 6 Dec 2011 09:39:35 -0300 Subject: [PATCH] [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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/tm6000/tm6000-input.c | 2 +- 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 af4bcf5..89e003c 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) rc->scanmask = 0xffff; rc->priv = ir; rc->change_protocol = tm6000_ir_change_protocol; - if (&dev->int_in) { + if (dev->int_in.endp) { rc->open = __tm6000_ir_int_start; rc->close = __tm6000_ir_int_stop; 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 7ce967b..bc13db7 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) usb_reset_configuration(dev->udev); - if (&dev->int_in) + if (dev->int_in.endp) usb_set_interface(dev->udev, dev->isoc_in.bInterfaceNumber, 2); else -- 2.7.4