From 08e3411eb217d8cb079e1adaedd111b3d875af10 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 2 Jun 2009 12:34:31 +0100
Subject: [PATCH] --- yaml --- r: 145474 b: refs/heads/master c:
 d3ae33efb8e2f277f9007eb060c9d0b91ab38ae1 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ata/pata_netcell.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5082f89f5ad5..f9697540407a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca55bd7e2905d344bf697f7c2cc347cb42999e7a
+refs/heads/master: d3ae33efb8e2f277f9007eb060c9d0b91ab38ae1
diff --git a/trunk/drivers/ata/pata_netcell.c b/trunk/drivers/ata/pata_netcell.c
index bdb236957cb9..9a698097134b 100644
--- a/trunk/drivers/ata/pata_netcell.c
+++ b/trunk/drivers/ata/pata_netcell.c
@@ -20,13 +20,24 @@
 
 /* No PIO or DMA methods needed for this device */
 
+static unsigned int netcell_read_id(struct ata_device *adev,
+					struct ata_taskfile *tf, u16 *id)
+{
+	unsigned int err_mask = ata_do_dev_read_id(adev, tf, id);
+	/* Firmware forgets to mark words 85-87 valid */
+	if (err_mask == 0)
+		id[ATA_ID_CSF_DEFAULT] |= 0x0400;
+	return err_mask;
+}
+
 static struct scsi_host_template netcell_sht = {
 	ATA_BMDMA_SHT(DRV_NAME),
 };
 
 static struct ata_port_operations netcell_ops = {
 	.inherits	= &ata_bmdma_port_ops,
-	.cable_detect		= ata_cable_80wire,
+	.cable_detect	= ata_cable_80wire,
+	.read_id	= netcell_read_id,
 };