From: Andrew Morton <akpm@osdl.org>

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ata/ata_jmicron.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/ata/ata_jmicron.c~1-of-2-jmicron-driver-hard_port_no-fix drivers/ata/ata_jmicron.c
--- a/drivers/ata/ata_jmicron.c~1-of-2-jmicron-driver-hard_port_no-fix
+++ a/drivers/ata/ata_jmicron.c
@@ -44,8 +44,8 @@ static int jmicron_pre_reset(struct ata_
 	struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
 	u32 control;
 	u32 control5;
-	int port_mask = 1<< (4 * ap->hard_port_no);
-	int port = ap->hard_port_no;
+	int port_mask = 1<< (4 * ap->port_no);
+	int port = ap->port_no;
 	port_type port_map[2];
 
 	/* Check if our port is enabled */
_