From 9c204f4d4c1b41a570d8da1de3850c9378c0c802 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Fri, 9 Oct 2009 11:49:10 +0200 Subject: [PATCH] --- yaml --- r: 173788 b: refs/heads/master c: e0c0978699a83f26f2341f7eedc1463b79e31aff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/ataflop.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 132aa12818f9..70776d90c5eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a7236e0f3f836439442e9161dd6d25fde7ca259 +refs/heads/master: e0c0978699a83f26f2341f7eedc1463b79e31aff diff --git a/trunk/drivers/block/ataflop.c b/trunk/drivers/block/ataflop.c index 847a9e57570a..a5af1d6dda8b 100644 --- a/trunk/drivers/block/ataflop.c +++ b/trunk/drivers/block/ataflop.c @@ -1478,10 +1478,7 @@ void do_fd_request(struct request_queue * q) stdma_lock(floppy_irq, NULL); atari_disable_irq( IRQ_MFP_FDC ); - local_save_flags(flags); /* The request function is called with ints - local_irq_disable(); * disabled... so must save the IPL for later */ redo_fd_request(); - local_irq_restore(flags); atari_enable_irq( IRQ_MFP_FDC ); }