diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2011-07-27 20:43:21 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 20:43:21 +0530 |
| commit | 1ae105aa7416087f2920c35c3cd16831d0d09c9c (patch) | |
| tree | 935b2d7c2b902f77b37e38ec9108f905fb09f690 /drivers/dma/intel_mid_dma.c | |
| parent | Linux 3.0 (diff) | |
| parent | Improve slave/cyclic DMA engine documentation (diff) | |
| download | linux-dev-1ae105aa7416087f2920c35c3cd16831d0d09c9c.tar.xz linux-dev-1ae105aa7416087f2920c35c3cd16831d0d09c9c.zip | |
Merge branch 'next' into for-linus-3.0
Diffstat (limited to 'drivers/dma/intel_mid_dma.c')
| -rw-r--r-- | drivers/dma/intel_mid_dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index f653517ef744..8a3fdd87db97 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c @@ -1351,7 +1351,6 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state) return -EAGAIN; } device->state = SUSPENDED; - pci_set_drvdata(pci, device); pci_save_state(pci); pci_disable_device(pci); pci_set_power_state(pci, PCI_D3hot); @@ -1380,7 +1379,6 @@ int dma_resume(struct pci_dev *pci) } device->state = RUNNING; iowrite32(REG_BIT0, device->dma_base + DMA_CFG); - pci_set_drvdata(pci, device); return 0; } |