diff options
Diffstat (limited to 'drivers/media/video/pxa_camera.c')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 388cf94055d3..cf96b2cc4f1c 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -1025,9 +1025,9 @@ static int pxa_camera_resume(struct soc_camera_device *icd) | |||
1025 | struct pxa_camera_dev *pcdev = ici->priv; | 1025 | struct pxa_camera_dev *pcdev = ici->priv; |
1026 | int i = 0, ret = 0; | 1026 | int i = 0, ret = 0; |
1027 | 1027 | ||
1028 | DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD; | 1028 | DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD; |
1029 | DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD; | 1029 | DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD; |
1030 | DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD; | 1030 | DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD; |
1031 | 1031 | ||
1032 | CICR0 = pcdev->save_cicr[i++] & ~CICR0_ENB; | 1032 | CICR0 = pcdev->save_cicr[i++] & ~CICR0_ENB; |
1033 | CICR1 = pcdev->save_cicr[i++]; | 1033 | CICR1 = pcdev->save_cicr[i++]; |
@@ -1171,9 +1171,9 @@ static int pxa_camera_probe(struct platform_device *pdev) | |||
1171 | } | 1171 | } |
1172 | dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]); | 1172 | dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]); |
1173 | 1173 | ||
1174 | DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD; | 1174 | DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD; |
1175 | DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD; | 1175 | DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD; |
1176 | DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD; | 1176 | DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD; |
1177 | 1177 | ||
1178 | /* request irq */ | 1178 | /* request irq */ |
1179 | err = request_irq(pcdev->irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME, | 1179 | err = request_irq(pcdev->irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME, |