Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / block / ataflop.c

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 847a9e57570ae4721b5130fcda9aaf8315219b35..a5af1d6dda8bc37eb25b5127bffb80c4dfa04406 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/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 );
 }