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

Commit dcee0bb7 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix 



Fix the recently added SH_DMAC_MAX_CHANNELS handling code in
300e5f97 dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handling

Without this fix the shdma driver outputs silly messages in
case SH_DMAC_MAX_CHANNELS happens to match the platform data:

sh-dma-engine sh-dma-engine.0: Attempting to register 20 DMA channels when a max
imum of 20 are supported.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 5bdbd4fa

drivers/dma/shdma.c

+7 −6
Original line number Diff line number Diff line
@@ -1221,6 +1221,11 @@ static int __init sh_dmae_probe(struct platform_device *pdev) 
	} else {

		do {

			for (i = chanirq_res->start; i <= chanirq_res->end; i++) {

				if (irq_cnt >= SH_DMAC_MAX_CHANNELS) {

					irq_cap = 1;

					break;

				}



				if ((errirq_res->flags & IORESOURCE_BITS) ==

				    IORESOURCE_IRQ_SHAREABLE)

					chan_flag[irq_cnt] = IRQF_SHARED;
@@ -1230,15 +1235,11 @@ static int __init sh_dmae_probe(struct platform_device *pdev) 
					"Found IRQ %d for channel %d\n",

					i, irq_cnt);

				chan_irq[irq_cnt++] = i;

			}



			if (irq_cnt >= SH_DMAC_MAX_CHANNELS)

				break;

			}



			if (irq_cnt >= SH_DMAC_MAX_CHANNELS) {

				irq_cap = 1;

				break;

			}

			chanirq_res = platform_get_resource(pdev,

						IORESOURCE_IRQ, ++irqres);

		} while (irq_cnt < pdata->channel_num && chanirq_res);