diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 01:58:01 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 01:58:01 -0700 | 
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /drivers/dma/dmatest.c | |
| parent | 05e882f890038c702a4f15d385135d03cf74ad48 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
| download | olio-linux-3.10-4894e4aca82aca927d0404ce61f021f790de4b1e.tar.xz olio-linux-3.10-4894e4aca82aca927d0404ce61f021f790de4b1e.zip  | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'drivers/dma/dmatest.c')
| -rw-r--r-- | drivers/dma/dmatest.c | 4 | 
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index a27c0fb1bc1..fb7da5141e9 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -531,9 +531,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 */  			}  |