Merge tag 'spi-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[firefly-linux-kernel-4.4.55.git] / drivers / block / amiflop.c

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 748dea4f34dc1e18b089557478a2b00221bd83c5..758da2287d9a3d01143c1d588c6f28dbbf0d8c14 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1406,7 +1406,7 @@ next_segment:
 
                track = block / (floppy->dtype->sects * floppy->type->sect_mult);
                sector = block % (floppy->dtype->sects * floppy->type->sect_mult);
-               data = rq->buffer + 512 * cnt;
+               data = bio_data(rq->bio) + 512 * cnt;
 #ifdef DEBUG
                printk("access to track %d, sector %d, with buffer at "
                       "0x%08lx\n", track, sector, data);