Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53eeb64e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8c35bf36 c50a898f

drivers/dma/ioat/dma_v2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -879,7 +879,7 @@ int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca) 
	dma->device_issue_pending = ioat2_issue_pending;

	dma->device_issue_pending = ioat2_issue_pending;

	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;

	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;

	dma->device_free_chan_resources = ioat2_free_chan_resources;

	dma->device_free_chan_resources = ioat2_free_chan_resources;

	dma->device_tx_status = ioat_tx_status;

	dma->device_tx_status = ioat_dma_tx_status;





	err = ioat_probe(device);

	err = ioat_probe(device);

	if (err)

	if (err)