projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
nvdimm
/
btt.c
diff --git
a/drivers/nvdimm/btt.c
b/drivers/nvdimm/btt.c
index eae93ab8ffcded3060c072a5299909ebee89aa7d..efb2c1ceef989b1eccc83e324d8daca08e1502e4 100644
(file)
--- a/
drivers/nvdimm/btt.c
+++ b/
drivers/nvdimm/btt.c
@@
-1150,7
+1150,7
@@
static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip,
return ret;
}
return ret;
}
-static
void
btt_make_request(struct request_queue *q, struct bio *bio)
+static
blk_qc_t
btt_make_request(struct request_queue *q, struct bio *bio)
{
struct bio_integrity_payload *bip = bio_integrity(bio);
struct btt *btt = q->queuedata;
{
struct bio_integrity_payload *bip = bio_integrity(bio);
struct btt *btt = q->queuedata;
@@
-1198,6
+1198,7
@@
static void btt_make_request(struct request_queue *q, struct bio *bio)
out:
bio_endio(bio);
out:
bio_endio(bio);
+ return BLK_QC_T_NONE;
}
static int btt_rw_page(struct block_device *bdev, sector_t sector,
}
static int btt_rw_page(struct block_device *bdev, sector_t sector,