35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 16 Nov 2011 01:53:25 -0300
|
|
Subject: [PATCH 3/5] [media] staging: lirc_serial: Fix deadlock on resume
|
|
failure
|
|
|
|
commit 1ff1d88e862948ae5bfe490248c023ff8ac2855d upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/staging/media/lirc/lirc_serial.c | 4 +---
|
|
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 d833772..befe626 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)
|
|
{
|
|
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 */
|
|
--
|
|
1.7.7.3
|
|
|