diff options
| author |   Len Brown <len.brown@intel.com> | 2008-10-25 04:07:44 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-25 04:07:44 -0400 |
| commit | 9fb3c5ca3dabe06758c35f790c68e273ed749e19 (patch) | |
| tree | 874eb114b57c5b30152e66d601a8e67ed81ec606 /drivers/dma | |
| parent | leds-hp-disk: fix build warning (diff) | |
| parent | i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined (diff) | |
| download | linux-dev-9fb3c5ca3dabe06758c35f790c68e273ed749e19.tar.xz linux-dev-9fb3c5ca3dabe06758c35f790c68e273ed749e19.zip | |
Merge branch 'i7300_idle' into release
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ioat_dma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 43b8cefad2c6..b0438c4f0c30 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -33,6 +33,7 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/workqueue.h> +#include <linux/i7300_idle.h> #include "ioatdma.h" #include "ioatdma_registers.h" #include "ioatdma_hw.h" @@ -171,8 +172,10 @@ 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--; +#ifdef CONFIG_I7300_IDLE_IOAT_CHANNEL + if (i7300_idle_platform_probe(NULL, NULL) == 0) { + device->common.chancnt--; + } #endif for (i = 0; i < device->common.chancnt; i++) { ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL); |