diff options
Diffstat (limited to 'drivers/dma/ioat/dma_v2.c')
-rw-r--r-- | drivers/dma/ioat/dma_v2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 137cf879265f..2f34f290041e 100644 --- a/drivers/dma/ioat/dma_v2.c +++ b/drivers/dma/ioat/dma_v2.c | |||
@@ -341,8 +341,7 @@ static void ioat2_cleanup_tasklet(unsigned long data) | |||
341 | struct ioat2_dma_chan *ioat = (void *) data; | 341 | struct ioat2_dma_chan *ioat = (void *) data; |
342 | 342 | ||
343 | ioat2_cleanup(ioat); | 343 | ioat2_cleanup(ioat); |
344 | writew(IOAT_CHANCTRL_INT_DISABLE, | 344 | writew(IOAT_CHANCTRL_RUN, ioat->base.reg_base + IOAT_CHANCTRL_OFFSET); |
345 | ioat->base.reg_base + IOAT_CHANCTRL_OFFSET); | ||
346 | } | 345 | } |
347 | 346 | ||
348 | /** | 347 | /** |
@@ -454,7 +453,6 @@ static int ioat2_alloc_chan_resources(struct dma_chan *c) | |||
454 | struct ioat2_dma_chan *ioat = to_ioat2_chan(c); | 453 | struct ioat2_dma_chan *ioat = to_ioat2_chan(c); |
455 | struct ioat_chan_common *chan = &ioat->base; | 454 | struct ioat_chan_common *chan = &ioat->base; |
456 | struct ioat_ring_ent **ring; | 455 | struct ioat_ring_ent **ring; |
457 | u16 chanctrl; | ||
458 | u32 chanerr; | 456 | u32 chanerr; |
459 | int descs; | 457 | int descs; |
460 | int i; | 458 | int i; |
@@ -464,9 +462,7 @@ static int ioat2_alloc_chan_resources(struct dma_chan *c) | |||
464 | return 1 << ioat->alloc_order; | 462 | return 1 << ioat->alloc_order; |
465 | 463 | ||
466 | /* Setup register to interrupt and write completion status on error */ | 464 | /* Setup register to interrupt and write completion status on error */ |
467 | chanctrl = IOAT_CHANCTRL_ERR_INT_EN | IOAT_CHANCTRL_ANY_ERR_ABORT_EN | | 465 | writew(IOAT_CHANCTRL_RUN, chan->reg_base + IOAT_CHANCTRL_OFFSET); |
468 | IOAT_CHANCTRL_ERR_COMPLETION_EN; | ||
469 | writew(chanctrl, chan->reg_base + IOAT_CHANCTRL_OFFSET); | ||
470 | 466 | ||
471 | chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET); | 467 | chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET); |
472 | if (chanerr) { | 468 | if (chanerr) { |