diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2017-11-01 23:31:49 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-11-15 04:13:33 +0100 |
| commit | 4fc930896db910c39999ed0e298798b57362772a (patch) | |
| tree | 83a2fddecc884f4a44fe224b025302649af83aad /drivers/ide | |
| parent | Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-4fc930896db910c39999ed0e298798b57362772a.tar.xz linux-4fc930896db910c39999ed0e298798b57362772a.zip | |
ide: Make ide_cdrom_prep_fs() initialize the sense buffer pointer
The changes introduced through commit 82ed4db499b8 assume that the
sense buffer pointer in struct scsi_request is initialized for all
requests - passthrough and filesystem requests. Hence make sure
that that pointer is initialized for filesystem requests. Remove
the memset() call that clears .cmd because the scsi_req_init()
call in ide_initialize_rq() already initializes the .cmd.
Fixes: commit 82ed4db499b8 ("block: split scsi_request out of struct request")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 6ff0be8cbdc9..7c3ed7c9af77 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1333,8 +1333,7 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq) unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9); struct scsi_request *req = scsi_req(rq); - scsi_req_init(req); - memset(req->cmd, 0, BLK_MAX_CDB); + q->initialize_rq_fn(rq); if (rq_data_dir(rq) == READ) req->cmd[0] = GPCMD_READ_10; |