From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 8 Apr 2009 22:08:23 +0000 (-0700)
Subject: dmatest: fix max channels handling
X-Git-Tag: v2.6.29.4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76616a7e4d43cc7a2383c2bc67e27636c43ffdfa;p=thirdparty%2Fkernel%2Fstable.git

dmatest: fix max channels handling

commit c56c81abe7e684bc6203632d807303eb765690dc upstream.

The check for reaching max_channels is short circuited by 'continuing'
after successfully adding a channel.

[ Impact: make the 'max_channels' module parameter actually have an effect ]

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index e190d8b30700c..7ffc5ac73c2f3 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -410,9 +410,7 @@ static int __init dmatest_init(void)
 		chan = dma_request_channel(mask, filter, NULL);
 		if (chan) {
 			err = dmatest_add_channel(chan);
-			if (err == 0)
-				continue;
-			else {
+			if (err) {
 				dma_release_channel(chan);
 				break; /* add_channel failed, punt */
 			}