Attachment 314499 Details for Bug 457028 – Backport of mainstream patches

[patch] Backport of mainstream patches

rhel4_bz457025_v4.patch (text/plain), 1.22 KB, created by Mauro Carvalho Chehab on 2008-08-18 21:58:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mauro Carvalho Chehab

Created: 2008-08-18 21:58:02 UTC

Size: 1.22 KB

patch

obsolete

>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
>index 35a66c5..31fad77 100644
>--- a/drivers/ide/ide-cd.c
>+++ b/drivers/ide/ide-cd.c
>@@ -2258,6 +2258,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
> 
> 	int stat;
> 	struct request req;
>+	u32 blocklen;
> 
> 	cdrom_prepare_request(&req);
> 
>@@ -2267,13 +2268,31 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
> 	req.data_len = sizeof(capbuf);
> 
> 	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;
>+
>+	/*
>+	 * 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;
> 	}
> 
>-	return stat;
>+	*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 457028: 314499