Attachment 314506 Details for Bug 457025 – Backport of mainstream patches

[patch] Backport of mainstream patches

rhel5_bz457025_v5.patch (text/plain), 1.23 KB, created by Mauro Carvalho Chehab on 2008-08-19 00:40:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mauro Carvalho Chehab

Created: 2008-08-19 00:40:24 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
>index 8ab958c..537ed07 100644
>--- a/drivers/ide/ide-cd.c
>+++ b/drivers/ide/ide-cd.c
>@@ -2216,6 +2216,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
> 
> 	int stat;
> 	struct request req;
>+	u32 blocklen;
> 
> 	cdrom_prepare_request(drive, &req);
> 
>@@ -2226,13 +2227,31 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
> 	req.flags |= REQ_QUIET;
> 
> 	stat = cdrom_queue_packet_command(drive, &req);
>-	if (stat == 0) {
>-		*capacity = 1 + be32_to_cpu(capbuf.lba);
>-		*sectors_per_frame =
>-			be32_to_cpu(capbuf.blocklen) >> SECTOR_BITS;
>-	}
>+	if (stat)
>+		return stat;
> 
>-	return stat;
>+	/*
>+	 * Sanity check the given block size
>+	 */
>+	blocklen = be32_to_cpu(capbuf.blocklen);
>+	switch (blocklen) {
>+	case 512:
>+	case 1024:
>+	case 2048:
>+	case 4096:
>+		break;
>+	default:
>+		printk(KERN_ERR "%s: weird block size %u\n",
>+			drive->name, blocklen);
>+		printk(KERN_ERR "%s: default to 2kb block size\n",
>+			drive->name);
>+		blocklen = 2048;
>+		break;
>+ 	}
>+ 
>+	*capacity = 1 + be32_to_cpu(capbuf.lba);
>+	*sectors_per_frame = blocklen >> SECTOR_BITS;
>+	return 0;
> }
> 
> static int cdrom_read_tocentry(ide_drive_t *drive, int trackno, int msf_flag,

Actions: View | Diff

Attachments on bug 457025: 314506