aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-11-15 23:53:25 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-24 15:17:50 -0500
commit1ff1d88e862948ae5bfe490248c023ff8ac2855d (patch)
treebf976c9db1c2411c4d037e2e113b495957c02f4b /drivers/staging
parentc8e57e1b766c2321aa76ee5e6878c69bd2313d62 (diff)
[media] staging: lirc_serial: Fix deadlock on resume failure
A resume function cannot remove the device it is resuming! Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/lirc/lirc_serial.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index d833772ef80..befe6267d7c 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct platform_device *dev)
1127{ 1127{
1128 unsigned long flags; 1128 unsigned long flags;
1129 1129
1130 if (hardware_init_port() < 0) { 1130 if (hardware_init_port() < 0)
1131 lirc_serial_exit();
1132 return -EINVAL; 1131 return -EINVAL;
1133 }
1134 1132
1135 spin_lock_irqsave(&hardware[type].lock, flags); 1133 spin_lock_irqsave(&hardware[type].lock, flags);
1136 /* Enable Interrupt */ 1134 /* Enable Interrupt */