---

yaml --- r: 208145 b: refs/heads/master c: 20cd195 h: refs/heads/master i: 208143: 2a25ed5 v: v3
git-mirror · Aug 9, 2010 · 9581da4 · 9581da4
1 parent d652b72
commit 9581da4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d69e85b644dbc8c68dec3b4149941989d4bcc66f
+refs/heads/master: 20cd19597238723237d214dbab18c0b7c68c5814
diff --git a/trunk/drivers/media/IR/imon.c b/trunk/drivers/media/IR/imon.c
@@ -1944,7 +1944,6 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
 
 urb_submit_failed:
 	ir_input_unregister(ictx->idev);
-	input_free_device(ictx->idev);
 idev_setup_failed:
 find_endpoint_failed:
 	mutex_unlock(&ictx->lock);
@@ -2014,10 +2013,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
 	return ictx;
 
 urb_submit_failed:
-	if (ictx->touch) {
+	if (ictx->touch)
 		input_unregister_device(ictx->touch);
-		input_free_device(ictx->touch);
-	}
 touch_setup_failed:
 find_endpoint_failed:
 	mutex_unlock(&ictx->lock);