Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de3e3b82 authored by roel kluin's avatar roel kluin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: pxa-camera: Unsigned dma_chans[] cannot be negative 



Unsigned dma_chans[] cannot be negative

Also the third time dma_chans[0] < 0 was tested instead of dma_chans[2]

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 26dc4d04

drivers/media/video/pxa_camera.c

+12 −12
Original line number Diff line number Diff line
@@ -1120,31 +1120,31 @@ static int pxa_camera_probe(struct platform_device *pdev) 
	pcdev->dev = &pdev->dev;



	/* request dma */

	pcdev->dma_chans[0] = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,

	err = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,

			      pxa_camera_dma_irq_y, pcdev);

	if (pcdev->dma_chans[0] < 0) {

	if (err < 0) {

		dev_err(pcdev->dev, "Can't request DMA for Y\n");

		err = -ENOMEM;

		goto exit_iounmap;

	}

	pcdev->dma_chans[0] = err;

	dev_dbg(pcdev->dev, "got DMA channel %d\n", pcdev->dma_chans[0]);



	pcdev->dma_chans[1] = pxa_request_dma("CI_U", DMA_PRIO_HIGH,

	err = pxa_request_dma("CI_U", DMA_PRIO_HIGH,

			      pxa_camera_dma_irq_u, pcdev);

	if (pcdev->dma_chans[1] < 0) {

	if (err < 0) {

		dev_err(pcdev->dev, "Can't request DMA for U\n");

		err = -ENOMEM;

		goto exit_free_dma_y;

	}

	pcdev->dma_chans[1] = err;

	dev_dbg(pcdev->dev, "got DMA channel (U) %d\n", pcdev->dma_chans[1]);



	pcdev->dma_chans[2] = pxa_request_dma("CI_V", DMA_PRIO_HIGH,

	err = pxa_request_dma("CI_V", DMA_PRIO_HIGH,

			      pxa_camera_dma_irq_v, pcdev);

	if (pcdev->dma_chans[0] < 0) {

	if (err < 0) {

		dev_err(pcdev->dev, "Can't request DMA for V\n");

		err = -ENOMEM;

		goto exit_free_dma_u;

	}

	pcdev->dma_chans[2] = err;

	dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]);



	DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD;