Merge tag 'sound-5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / drivers / block / floppy.c

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index fb23578..6f2856c 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2231,7 +2231,6 @@ static void request_done(int uptodate)
 {
        struct request *req = current_req;
        struct request_queue *q;
-       unsigned long flags;
        int block;
        char msg[sizeof("request done ") + sizeof(int) * 3];
 
@@ -2254,10 +2253,7 @@ static void request_done(int uptodate)
                if (block > _floppy->sect)
                        DRS->maxtrack = 1;
 
-               /* unlock chained buffers */
-               spin_lock_irqsave(q->queue_lock, flags);
                floppy_end_request(req, 0);
-               spin_unlock_irqrestore(q->queue_lock, flags);
        } else {
                if (rq_data_dir(req) == WRITE) {
                        /* record write error information */
@@ -2269,9 +2265,7 @@ static void request_done(int uptodate)
                        DRWE->last_error_sector = blk_rq_pos(req);
                        DRWE->last_error_generation = DRS->generation;
                }
-               spin_lock_irqsave(q->queue_lock, flags);
                floppy_end_request(req, BLK_STS_IOERR);
-               spin_unlock_irqrestore(q->queue_lock, flags);
        }
 }