From fa93c0175da094d1a760a8c77d3903689a9a9617 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 24 Mar 2009 23:22:39 +0100 Subject: [PATCH] --- yaml --- r: 133359 b: refs/heads/master c: 0688d3a6ba9bf4e1df62ce627ad1daa0e2bf9148 h: refs/heads/master i: 133357: 4d73c5d8e347f4ce3c9048b9b790dc5673efc4b1 133355: 57f94f0a43ba9b9b8b04b9b6e3717179087a150c 133351: cc82143b1d0655814d458e3ca896045cbb1d34db 133343: 22dcde8a96ee8fca9d8db5e48de5e75a6b830d73 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ac393a1450d1..36b328520fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7362951b4818763b6abaecd3f870739125145cc1 +refs/heads/master: 0688d3a6ba9bf4e1df62ce627ad1daa0e2bf9148 diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 63f67e3c2555..5deb7e717333 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -940,8 +940,6 @@ static int init_irq (ide_hwif_t *hwif) irq_handler_t irq_handler; int sa = 0; - mutex_lock(&ide_cfg_mtx); - irq_handler = hwif->host->irq_handler; if (irq_handler == NULL) irq_handler = ide_intr; @@ -979,10 +977,8 @@ static int init_irq (ide_hwif_t *hwif) printk(KERN_CONT " (serialized)"); printk(KERN_CONT "\n"); - mutex_unlock(&ide_cfg_mtx); return 0; out_up: - mutex_unlock(&ide_cfg_mtx); return 1; }