From 9e308959c3ef3121bf442e5dfa71bf23e38cb927 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 16 Nov 2011 01:53:25 -0300 Subject: [PATCH] --- yaml --- r: 285249 b: refs/heads/master c: 1ff1d88e862948ae5bfe490248c023ff8ac2855d h: refs/heads/master i: 285247: ddeca82d2e9a9ec1f859e4e275e2cb11549be364 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/lirc/lirc_serial.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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 */