diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-07-19 11:31:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-07-20 17:38:27 -0600 |
| commit | 4eef39c90665fe73689b176dcd8cdff4a9a91274 (patch) | |
| tree | 86092833a705c080e078a6ad4b5c1d92f8970c15 /drivers/memstick | |
| parent | c0acf12a50c2b6cbaf72bdfe2b1b514c369a83c5 (diff) | |
| download | linux-4eef39c90665fe73689b176dcd8cdff4a9a91274.tar.bz2 | |
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>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/core/ms_block.c | 3 | ||||
| -rw-r--r-- | drivers/memstick/core/mspro_block.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 0fc43c7cc93c..40bb8ae5853c 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -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; } diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 25b66c540457..c1472275fe57 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -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; } |