From 9581da4b5f1b9c4ac79e575c57dfcd9ebf1e7173 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Mon, 26 Jul 2010 11:11:36 -0300
Subject: [PATCH] --- yaml --- r: 208145 b: refs/heads/master c:
 20cd19597238723237d214dbab18c0b7c68c5814 h: refs/heads/master i:   208143:
 2a25ed563f0d6a0a1dde89aa7a8d5c12fb996f05 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/media/IR/imon.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9f4ce546ab13..92c36189cac1 100644
--- 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
index 65c125e44e96..a665d48bed47 100644
--- 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);