| From 1ff1d88e862948ae5bfe490248c023ff8ac2855d Mon Sep 17 00:00:00 2001 |
| From: Ben Hutchings <ben@decadent.org.uk> |
| Date: Wed, 16 Nov 2011 01:53:25 -0300 |
| Subject: media: staging: lirc_serial: Fix deadlock on resume failure |
| |
| From: Ben Hutchings <ben@decadent.org.uk> |
| |
| 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> |
| Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| --- |
| drivers/staging/media/lirc/lirc_serial.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- 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 pla |
| { |
| 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 */ |
