diff --git a/[refs] b/[refs]
index af46bea5827a..2a486fc807a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11750a40abddff1e0c6e0924902f914292d12277
+refs/heads/master: 591a6e8ee7c8ffbbeaf23fec23796c0cfa316a41
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 479f95a5c0a3..25d8d3f778a1 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -1597,10 +1597,10 @@ int ata_dev_configure(struct ata_device *dev)
 		dev->n_sectors = ata_id_n_sectors(id);
 
 		/* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
-		ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV_OFS,
+		ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
 				sizeof(fwrevbuf));
 
-		ata_id_c_string(dev->id, modelbuf, ATA_ID_PROD_OFS,
+		ata_id_c_string(dev->id, modelbuf, ATA_ID_PROD,
 				sizeof(modelbuf));
 
 		if (dev->id[59] & 0x100)