---

yaml --- r: 271640 b: refs/heads/master c: 6d51477 h: refs/heads/master v: v3
git-mirror · Jul 31, 2011 · 65cf6bc · 65cf6bc
1 parent c577436
commit 65cf6bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b05681b91709a19b40a452f566cc852619b30082
+refs/heads/master: 6d51477470728074cea396a0127d73c5590dd441
diff --git a/trunk/drivers/media/video/em28xx/em28xx-input.c b/trunk/drivers/media/video/em28xx/em28xx-input.c
@@ -463,11 +463,11 @@ int em28xx_ir_fini(struct em28xx *dev)
 	if (!ir)
 		return 0;
 
-	em28xx_ir_stop(ir->rc);
-	rc_unregister_device(ir->rc);
-	kfree(ir);
+	if (ir->rc)
+		rc_unregister_device(ir->rc);
 
 	/* done */
+	kfree(ir);
 	dev->ir = NULL;
 	return 0;
 }