diff options
Diffstat (limited to 'drivers/dma/intel_mid_dma.c')
-rw-r--r-- | drivers/dma/intel_mid_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index 798f46a4590d..3d4ec38b9b62 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c | |||
@@ -911,8 +911,8 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan) | |||
911 | 911 | ||
912 | /** | 912 | /** |
913 | * midc_handle_error - Handle DMA txn error | 913 | * midc_handle_error - Handle DMA txn error |
914 | * @mid: controller where error occured | 914 | * @mid: controller where error occurred |
915 | * @midc: chan where error occured | 915 | * @midc: chan where error occurred |
916 | * | 916 | * |
917 | * Scan the descriptor for error | 917 | * Scan the descriptor for error |
918 | */ | 918 | */ |
@@ -1099,7 +1099,7 @@ static int mid_setup_dma(struct pci_dev *pdev) | |||
1099 | dma->mask_reg = ioremap(LNW_PERIPHRAL_MASK_BASE, | 1099 | dma->mask_reg = ioremap(LNW_PERIPHRAL_MASK_BASE, |
1100 | LNW_PERIPHRAL_MASK_SIZE); | 1100 | LNW_PERIPHRAL_MASK_SIZE); |
1101 | if (dma->mask_reg == NULL) { | 1101 | if (dma->mask_reg == NULL) { |
1102 | pr_err("ERR_MDMA:Cant map periphral intr space !!\n"); | 1102 | pr_err("ERR_MDMA:Can't map periphral intr space !!\n"); |
1103 | return -ENOMEM; | 1103 | return -ENOMEM; |
1104 | } | 1104 | } |
1105 | } else | 1105 | } else |
@@ -1373,7 +1373,7 @@ int dma_resume(struct pci_dev *pci) | |||
1373 | pci_restore_state(pci); | 1373 | pci_restore_state(pci); |
1374 | ret = pci_enable_device(pci); | 1374 | ret = pci_enable_device(pci); |
1375 | if (ret) { | 1375 | if (ret) { |
1376 | pr_err("MDMA: device cant be enabled for %x\n", pci->device); | 1376 | pr_err("MDMA: device can't be enabled for %x\n", pci->device); |
1377 | return ret; | 1377 | return ret; |
1378 | } | 1378 | } |
1379 | device->state = RUNNING; | 1379 | device->state = RUNNING; |