From 3959881455751f51fe05bcc42274085c62e3769d Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Tue, 6 Dec 2011 09:39:35 -0300 Subject: [PATCH] --- yaml --- r: 285363 b: refs/heads/master c: 4be9c8fb58e48cd0110bd9504b0af1e18fa54467 h: refs/heads/master i: 285361: a47233f6fec301d449689865526cdcd089b76ed7 285359: 2a40933c9d468fb5e98840455b0676200e48ae2d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tm6000/tm6000-input.c | 2 +- trunk/drivers/media/video/tm6000/tm6000-video.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a2f0108fe143..80159964b691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 875f0e3da1e88f166940cbb5e530b05eb64ccc1f +refs/heads/master: 4be9c8fb58e48cd0110bd9504b0af1e18fa54467 diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c index af4bcf5288a9..89e003c0cfed 100644 --- a/trunk/drivers/media/video/tm6000/tm6000-input.c +++ b/trunk/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/trunk/drivers/media/video/tm6000/tm6000-video.c b/trunk/drivers/media/video/tm6000/tm6000-video.c index 7ce967bf01ec..bc13db736e24 100644 --- a/trunk/drivers/media/video/tm6000/tm6000-video.c +++ b/trunk/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