diff --git a/[refs] b/[refs]
index e3c084da9534..dcfc65a738f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e57e1b766c2321aa76ee5e6878c69bd2313d62
+refs/heads/master: 1ff1d88e862948ae5bfe490248c023ff8ac2855d
diff --git a/trunk/drivers/staging/media/lirc/lirc_serial.c b/trunk/drivers/staging/media/lirc/lirc_serial.c
index d833772ef806..befe6267d7cb 100644
--- a/trunk/drivers/staging/media/lirc/lirc_serial.c
+++ b/trunk/drivers/staging/media/lirc/lirc_serial.c
@@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct platform_device *dev)
 {
 	unsigned long flags;
 
-	if (hardware_init_port() < 0) {
-		lirc_serial_exit();
+	if (hardware_init_port() < 0)
 		return -EINVAL;
-	}
 
 	spin_lock_irqsave(&hardware[type].lock, flags);
 	/* Enable Interrupt */