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
input: touchscreen: add touch screen of gslx680 for rk3399-firefly-edp
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
block
/
pktcdvd.c
diff --git
a/drivers/block/pktcdvd.c
b/drivers/block/pktcdvd.c
index 2f477d45d6cfa42d586080db8c293d41406055ae..d06c62eccdf00b81241fba6b3e6d3a05e4e4c923 100644
(file)
--- a/
drivers/block/pktcdvd.c
+++ b/
drivers/block/pktcdvd.c
@@
-2441,7
+2441,7
@@
static void pkt_make_request_write(struct request_queue *q, struct bio *bio)
}
}
}
}
-static
void
pkt_make_request(struct request_queue *q, struct bio *bio)
+static
blk_qc_t
pkt_make_request(struct request_queue *q, struct bio *bio)
{
struct pktcdvd_device *pd;
char b[BDEVNAME_SIZE];
{
struct pktcdvd_device *pd;
char b[BDEVNAME_SIZE];
@@
-2467,7
+2467,7
@@
static void pkt_make_request(struct request_queue *q, struct bio *bio)
*/
if (bio_data_dir(bio) == READ) {
pkt_make_request_read(pd, bio);
*/
if (bio_data_dir(bio) == READ) {
pkt_make_request_read(pd, bio);
- return;
+ return
BLK_QC_T_NONE
;
}
if (!test_bit(PACKET_WRITABLE, &pd->flags)) {
}
if (!test_bit(PACKET_WRITABLE, &pd->flags)) {
@@
-2499,13
+2499,12
@@
static void pkt_make_request(struct request_queue *q, struct bio *bio)
pkt_make_request_write(q, split);
} while (split != bio);
pkt_make_request_write(q, split);
} while (split != bio);
- return;
+ return
BLK_QC_T_NONE
;
end_io:
bio_io_error(bio);
end_io:
bio_io_error(bio);
+ return BLK_QC_T_NONE;
}
}
-
-
static void pkt_init_queue(struct pktcdvd_device *pd)
{
struct request_queue *q = pd->disk->queue;
static void pkt_init_queue(struct pktcdvd_device *pd)
{
struct request_queue *q = pd->disk->queue;