Skip to contentSkip to conversation

icside: DMA support fix

PATCH Applied Bartlomiej Zolnierkiewicz 2 participants 4 messages Oct 11, 2011 – Oct 13, 2011 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 icside: DMA support fix

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: DMA support fix

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/icside.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ide/icside.c +1 -1
Index: b/drivers/ide/icside.c
===================================================================
@@ -521,8 +521,8 @@ icside_register_v6(struct icside_state *
 	if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
 		d.init_dma = icside_dma_init;
 		d.port_ops = &icside_v6_port_ops;
+	} else
 		d.dma_ops = NULL;
-	}
 
 	ret = ide_host_register(host, &d, hws);
 	if (ret)
author
#2 lore raw
Quoted 10 lines · David Miller

From: Bartlomiej Zolnierkiewicz <[email protected]>
Date: Tue, 11 Oct 2011 19:33:48 +0200

Quoted 4 lines

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] icside: DMA support fix

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

You're going to have to give me a more verbose commit message than that.

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH v2] icside: DMA support fix

Fix problem introduced by commit 5e37bdc ("ide: add struct ide_dma_ops (take 3)"): d.dma_ops shouldn't be cleared if we are going to use DMA.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
v2: updated patch description

 drivers/ide/icside.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ide/icside.c +1 -1
Index: b/drivers/ide/icside.c
===================================================================
@@ -521,8 +521,8 @@ icside_register_v6(struct icside_state *
 	if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
 		d.init_dma = icside_dma_init;
 		d.port_ops = &icside_v6_port_ops;
+	} else
 		d.dma_ops = NULL;
-	}
 
 	ret = ide_host_register(host, &d, hws);
 	if (ret)