From 0f7f59460ef2b9ec756726cede6fe33c1ec445ab Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 16 Jul 2008 20:33:40 +0200
Subject: [PATCH] --- yaml --- r: 102095 b: refs/heads/master c:
 dccdf527379dc2fe8a4efc5c75601d1d4035a750 h: refs/heads/master i:   102093:
 87cdd606c474b9c155798998ef47dfef88971f77   102091:
 d38f7a4ba5c8e54d80697120884fc4e18312ae1e   102087:
 cfa4d76103d978db32940bd122e5199724dd12ae   102079:
 10de5357fe291d5d9b70fb420107be675abce581 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/ide/legacy/ide-cs.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 90419ecbfddb..c23cb3386253 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f333f92bf9040fb63d13c184295629c7a0ff449f
+refs/heads/master: dccdf527379dc2fe8a4efc5c75601d1d4035a750
diff --git a/trunk/drivers/ide/legacy/ide-cs.c b/trunk/drivers/ide/legacy/ide-cs.c
index 7c69608154c2..fc53dcfbfe38 100644
--- a/trunk/drivers/ide/legacy/ide-cs.c
+++ b/trunk/drivers/ide/legacy/ide-cs.c
@@ -154,6 +154,11 @@ static const struct ide_port_ops idecs_port_ops = {
 	.quirkproc		= ide_undecoded_slave,
 };
 
+static const struct ide_port_info idecs_port_info = {
+	.port_ops		= &idecs_port_ops,
+	.host_flags		= IDE_HFLAG_NO_DMA,
+};
+
 static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
 				unsigned long irq, struct pcmcia_device *handle)
 {
@@ -188,11 +193,10 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
     i = hwif->index;
 
     ide_init_port_hw(hwif, &hw);
-    hwif->port_ops = &idecs_port_ops;
 
     idx[0] = i;
 
-    ide_device_add(idx, NULL);
+    ide_device_add(idx, &idecs_port_info);
 
     if (hwif->present)
 	return hwif;