[PATCH 037/117] cdrom: Convert to the scsi_status union

Bart Van Assche
2021-04-20T00:09:54Z

Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/cdrom/cdrom.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 90ad34c6ef8e..686b9d2bd94a 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2215,7 +2215,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
bio = rq->bio;

blk_execute_rq(cdi->disk, rq, 0);
- if (scsi_req(rq)->result) {
+ if (scsi_req(rq)->status.combined) {
struct scsi_sense_hdr sshdr;

ret = -EIO;