diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:14:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:14:55 +1000 |
| commit | 4b0ff7fcb8a0e95a90f1a0aa54c70ad8cc7bcd4b (patch) | |
| tree | 356ae992cf0c136a28f0cd0303177900b48c858b /drivers/mtd | |
| parent | accfdcb50b4fdd78759eb7f4d8f344c22376e31a (diff) | |
| parent | 35c6b0f43b1d9557e6341362b5bce2dff1cd25a0 (diff) | |
Merge remote-tracking branch 'block/for-next'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/mtd_blkdevs.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/ubi/block.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index d2f0da91a5bd..43e30992a369 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -82,8 +82,7 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr, block = blk_rq_pos(req) << 9 >> tr->blkshift; nsect = blk_rq_cur_bytes(req) >> tr->blkshift; - - buf = req->buffer; + buf = bio_data(req->bio); if (req->cmd_type != REQ_TYPE_FS) return -EIO; diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 8d659e6a1b4c..20a667c95da4 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -253,7 +253,7 @@ static int do_ubiblock_request(struct ubiblock *dev, struct request *req) * flash access anyway. */ mutex_lock(&dev->dev_mutex); - ret = ubiblock_read(dev, req->buffer, sec, len); + ret = ubiblock_read(dev, bio_data(req->bio), sec, len); mutex_unlock(&dev->dev_mutex); return ret; |