From: Takashi Iwai Subject: Re: [PATCH] staging: &&/|| typo Date: Mon, 16 Feb 2009 10:40:37 +0100 Message-ID: References: <49987237.7040604@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 1FBC224444 for ; Mon, 16 Feb 2009 10:40:42 +0100 (CET) In-Reply-To: <49987237.7040604@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Roel Kluin Cc: alsa-devel@alsa-project.org, Andrew Morton List-Id: alsa-devel@alsa-project.org At Sun, 15 Feb 2009 20:51:19 +0100, Roel Kluin wrote: > > &&/|| typo > > Signed-off-by: Roel Kluin 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); >