From e5518c634545e15571d580303b672c061aaf5e9f Mon Sep 17 00:00:00 2001 From: Robert Hancock Date: Mon, 16 Feb 2009 20:15:08 -0600 Subject: [PATCH] --- yaml --- r: 132047 b: refs/heads/master c: 968e594afdbc40b4270f9d4032ae8350475749d6 h: refs/heads/master i: 132045: fdf471dcad4f95c81157c52d9c0aa1686b8da191 132043: 19a837a5edaa318ec17d73e44d6da462233cf627 132039: a784171a169a2303aae1cad65dfc5e0f43a37271 132031: 0c47f96ca6a031cccb078be0b8818f691d85c8ca v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa2f18ac9a81..962b2205fe02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6515e6ff4ad3db4bd5ef2dd4e1026a7aca2482e +refs/heads/master: 968e594afdbc40b4270f9d4032ae8350475749d6 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 5e324cea3019..060bcd601f57 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -1322,14 +1322,16 @@ static u64 ata_id_n_sectors(const u16 *id) { if (ata_id_has_lba(id)) { if (ata_id_has_lba48(id)) - return ata_id_u64(id, 100); + return ata_id_u64(id, ATA_ID_LBA_CAPACITY_2); else - return ata_id_u32(id, 60); + return ata_id_u32(id, ATA_ID_LBA_CAPACITY); } else { if (ata_id_current_chs_valid(id)) - return ata_id_u32(id, 57); + return id[ATA_ID_CUR_CYLS] * id[ATA_ID_CUR_HEADS] * + id[ATA_ID_CUR_SECTORS]; else - return id[1] * id[3] * id[6]; + return id[ATA_ID_CYLS] * id[ATA_ID_HEADS] * + id[ATA_ID_SECTORS]; } }