diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 07:28:36 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 07:28:36 +0400 |
| commit | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (patch) | |
| tree | 19f9a50f337fe3ee2d57a63ca6d7739a2fdbc3d2 /drivers/dma/ioat_dma.c | |
| parent | ead90393438e0100763c6afd58eaae6a8418c6df (diff) | |
| parent | 27471fdb32e77ecb92f09d4ac5757785b4dc33bc (diff) | |
| download | linux-530bc23bfeaa9156003afbeb9708fd03a5f1c73c.tar.xz | |
Merge branch 'i7300_idle' into test
Diffstat (limited to 'drivers/dma/ioat_dma.c')
| -rw-r--r-- | drivers/dma/ioat_dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index bc8c6e3470ca..f8396cafa05f 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -171,6 +171,9 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device) xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET); xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale)); +#if CONFIG_I7300_IDLE_IOAT_CHANNEL + device->common.chancnt--; +#endif for (i = 0; i < device->common.chancnt; i++) { ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL); if (!ioat_chan) { |