---

yaml --- r: 285363 b: refs/heads/master c: 4be9c8f h: refs/heads/master i: 285361: a47233f 285359: 2a40933 v: v3
git-mirror · Dec 11, 2011 · 3959881 · 3959881
1 parent c4fd43c
commit 3959881
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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