Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

1 files changed, 0 insertions, 2 deletions

diff --git a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c
index b3074cbaa479..c3ccaf24f3e0 100644
--- a/arch/um/kernel/irq_user.c
+++ b/arch/um/kernel/irq_user.c
@@ -85,8 +85,6 @@ void sigio_handler(int sig, union uml_pt_regs *regs)
                                 next = irq_fd->next;
                                 if(irq_fd->freed){
                                         free_irq(irq_fd->irq, irq_fd->id);
-                                        free_irq_by_irq_and_dev(irq_fd->irq,
-                                                                irq_fd->id);
                                 }
                         }
                 }