Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eef39c9 authored Jul 19, 2016 by Christoph Hellwig Committed by Jens Axboe Jul 20, 2016

memstick: don't allow REQ_TYPE_BLOCK_PC requests



There is no code to issue or handle REQ_TYPE_BLOCK_PC request in the
memstick drivers, so remove the bogus conditional.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent c0acf12a

drivers/memstick/core/ms_block.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2002,8 +2002,7 @@ static int msb_bd_getgeo(struct block_device *bdev,

		static int msb_prepare_req(struct request_queue q, struct request req)
		{
		if (req->cmd_type != REQ_TYPE_FS &&
		req->cmd_type != REQ_TYPE_BLOCK_PC) {
		if (req->cmd_type != REQ_TYPE_FS) {
		blk_dump_rq_flags(req, "MS unsupported request");
		return BLKPREP_KILL;
		}

drivers/memstick/core/mspro_block.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -829,8 +829,7 @@ static void mspro_block_start(struct memstick_dev *card)

		static int mspro_block_prepare_req(struct request_queue q, struct request req)
		{
		if (req->cmd_type != REQ_TYPE_FS &&
		req->cmd_type != REQ_TYPE_BLOCK_PC) {
		if (req->cmd_type != REQ_TYPE_FS) {
		blk_dump_rq_flags(req, "MSPro unsupported request");
		return BLKPREP_KILL;
		}