From c75d4b495e88bd7735292609094a9185a173c895 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 23 Jun 2009 16:01:06 -0700
Subject: [PATCH] --- yaml --- r: 154313 b: refs/heads/master c:
 af054ed0018f0a69f8ea6f7546cbf34385edf13b h: refs/heads/master i:   154311:
 4e6179caf82490b995a97458239ebcb0d6b5bff8 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e739ef76369..bca5113aa666 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc36c7610731115c77700dcc53901920361c235
+refs/heads/master: af054ed0018f0a69f8ea6f7546cbf34385edf13b
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index 4a19686fcfe9..a9a1bfb14e7c 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -876,9 +876,12 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
 		return stat;
 
 	/*
-	 * Sanity check the given block size
+	 * Sanity check the given block size, in so far as making
+	 * sure the sectors_per_frame we give to the caller won't
+	 * end up being bogus.
 	 */
 	blocklen = be32_to_cpu(capbuf.blocklen);
+	blocklen = (blocklen >> SECTOR_BITS) << SECTOR_BITS;
 	switch (blocklen) {
 	case 512:
 	case 1024: