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

Commit eee49298 authored by Roel Kluin's avatar Roel Kluin Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-cd: clean up cdrom_analyze_sense_data() 



[bart: fix handling of bio_sectors(failed_command->bio) == 0]

Signed-off-by: default avatarRoel Kluin <12o3l@tiscali.nl>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a83ead23

drivers/ide/ide-cd.c

+2 −5
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive, 
{

	unsigned long sector;

	unsigned long bio_sectors;

	unsigned long valid;

	struct cdrom_info *info = drive->driver_data;



	if (!cdrom_log_sense(drive, failed_command, sense))
@@ -173,14 +172,12 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive, 
				 (sense->information[2] <<  8) |

				 (sense->information[3]);



			bio_sectors = bio_sectors(failed_command->bio);

			if (bio_sectors < 4)

				bio_sectors = 4;

			if (drive->queue->hardsect_size == 2048)

				/* device sector size is 2K */

				sector <<= 2;



			bio_sectors = max(bio_sectors(failed_command->bio), 4U);

			sector &= ~(bio_sectors - 1);

			valid = (sector - failed_command->sector) << 9;



			if (sector < get_capacity(info->disk) &&

			    drive->probed_capacity - sector < 4 * 75)