diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:51:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:51:59 -0400 |
| commit | 53eeb64e808971207350386121f4bab12fa2f45f (patch) | |
| tree | 74c98b6fff0095b7554edcfe69eb5ab3b22d2d1b /drivers | |
| parent | 8c35bf368c4e533d07610810e4c3b84c34c8e201 (diff) | |
| parent | c50a898fd4e736623ee175920db056194e0bb483 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
ioat2: fix performance regression
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/ioat/dma_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 216f9d383b5b..effd140fc042 100644 --- a/drivers/dma/ioat/dma_v2.c +++ b/drivers/dma/ioat/dma_v2.c | |||
| @@ -879,7 +879,7 @@ int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca) | |||
| 879 | dma->device_issue_pending = ioat2_issue_pending; | 879 | dma->device_issue_pending = ioat2_issue_pending; |
| 880 | dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; | 880 | dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; |
| 881 | dma->device_free_chan_resources = ioat2_free_chan_resources; | 881 | dma->device_free_chan_resources = ioat2_free_chan_resources; |
| 882 | dma->device_tx_status = ioat_tx_status; | 882 | dma->device_tx_status = ioat_dma_tx_status; |
| 883 | 883 | ||
| 884 | err = ioat_probe(device); | 884 | err = ioat_probe(device); |
| 885 | if (err) | 885 | if (err) |