1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index e19caa1453a3..89a112d513ad 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1307,6 +1307,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         int stat;
         unsigned char cmd[BLK_MAX_CDB];
         unsigned len = sizeof(capbuf);
+        u32 blocklen;
 
         memset(cmd, 0, BLK_MAX_CDB);
         cmd[0] = GPCMD_READ_CDVD_CAPACITY;
@@ -1319,23 +1320,24 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         /*
          * Sanity check the given block size
          */
-        switch (capbuf.blocklen) {
-        case __constant_cpu_to_be32(512):
-        case __constant_cpu_to_be32(1024):
-        case __constant_cpu_to_be32(2048):
-        case __constant_cpu_to_be32(4096):
+        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, capbuf.blocklen);
+                        drive->name, blocklen);
                 printk(KERN_ERR "%s: default to 2kb block size\n",
                         drive->name);
-                capbuf.blocklen = __constant_cpu_to_be32(2048);
+                blocklen = 2048;
                 break;
         }
 
         *capacity = 1 + be32_to_cpu(capbuf.lba);
-        *sectors_per_frame = be32_to_cpu(capbuf.blocklen) >> SECTOR_BITS;
+        *sectors_per_frame = blocklen >> SECTOR_BITS;
         return 0;
 }