Merge branch 'for-3.16/core' of git://git.kernel.dk/linux-block into next

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

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 96b629e1f0c9b0d887187b9a529ecee2c19d9945..2104b1b4ccda276dd324b12b843468c322a39ed5 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1484,7 +1484,7 @@ repeat:
        ReqCnt = 0;
        ReqCmd = rq_data_dir(fd_request);
        ReqBlock = blk_rq_pos(fd_request);
-       ReqBuffer = fd_request->buffer;
+       ReqBuffer = bio_data(fd_request->bio);
        setup_req_params( drive );
        do_fd_action( drive );
 
@@ -1952,7 +1952,7 @@ static int __init atari_floppy_init (void)
                goto Enomem;
        }
        TrackBuffer = DMABuffer + 512;
-       PhysDMABuffer = virt_to_phys(DMABuffer);
+       PhysDMABuffer = atari_stram_to_phys(DMABuffer);
        PhysTrackBuffer = virt_to_phys(TrackBuffer);
        BufferDrive = BufferSide = BufferTrack = -1;