Re: [PATCH] 2.5.59 : sound/oss/vidc.c

[Russell King]

On Fri, Feb 07, 2003 at 12:13:04PM -0500, Frank Davis wrote:
> Hello all,
>    The following patch addresses buzilla bug # 318, and removes an
> offending semicolon. Please review for inclusion.
> 
> Regards,
> Frank
> 
> --- linux/sound/oss/vidc.c.old	2003-01-16 21:21:38.000000000 -0500
> +++ linux/sound/oss/vidc.c	2003-02-07 02:59:44.000000000 -0500
> @@ -225,7 +225,7 @@
>  			newsize = 208;
>  		if (newsize > 4096)
>  			newsize = 4096;
> -		for (new2size = 128; new2size < newsize; new2size <<= 1);
> +		for (new2size = 128; new2size < newsize; new2size <<= 1)
>  			if (new2size - newsize > newsize - (new2size >> 1))
>  				new2size >>= 1;
>  		if (new2size > 4096) {

The code is correct as it originally stood.

It looks like indent has a bug and incorrectly formats this to look wrong.
Back in 2.2 times, the code looks  like this:

		for (new2size = 128; new2size < newsize; new2size <<= 1);
		if (new2size - newsize > newsize - (new2size >> 1))
			new2size >>= 1;

and this is the intended functionality.  Please do NOT apply the patch.

-- 
Russell King ([e-mail])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html