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

Commit bf12a9c1 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-cd: use ide_end_rq() also for failed non-fs requests 



Use ide_end_rq() also for failed non-fs requests on completion
of REQUEST SENSE requests + use blk_rq_bytes() while at it.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 116e690f

drivers/ide/ide-cd.c

+4 −12
Original line number Diff line number Diff line
@@ -265,18 +265,10 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate) 
				failed->sense_len = rq->sense_len;

			}

			cdrom_analyze_sense_data(drive, failed, sense);

			/*

			 * now end the failed request

			 */

			if (blk_fs_request(failed)) {



			if (ide_end_rq(drive, failed, -EIO,

						failed->hard_nr_sectors << 9))

				       blk_rq_bytes(failed)))

				BUG();

			} else {

				if (blk_end_request(failed, -EIO,

						    failed->data_len))

					BUG();

			}

		} else

			cdrom_analyze_sense_data(drive, NULL, sense);

	}