[alsa-devel] [PATCH] staging: &&/|| typo

[Takashi Iwai]

At Sun, 15 Feb 2009 20:51:19 +0100,
Roel Kluin wrote:
> 
> &&/|| typo
> 
> Signed-off-by: Roel Kluin <roel.kluin at gmail.com>

Thanks, applied now.

Though, this change wasn't really tested by any hardware and it's
no urgent issue, I'll put it for the next kernel.


Takashi

> ---
> // vi sound/oss/ad1848.c +83
> #define MD_1845         4
> ...
> #define MD_1845_SSCAPE  9 /* Ensoniq Soundscape PNP*/
> 
> diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
> index 7cf9913..a5b8356 100644
> --- a/sound/oss/ad1848.c
> +++ b/sound/oss/ad1848.c
> @@ -2107,7 +2107,7 @@ int ad1848_control(int cmd, int arg)
>  	switch (cmd)
>  	{
>  		case AD1848_SET_XTAL:	/* Change clock frequency of AD1845 (only ) */
> -			if (devc->model != MD_1845 || devc->model != MD_1845_SSCAPE)
> +			if (devc->model != MD_1845 && devc->model != MD_1845_SSCAPE)
>  				return -EINVAL;
>  			spin_lock_irqsave(&devc->lock,flags);
>  			ad_enter_MCE(devc);
>