[alsa-devel] [PATCH] sound/usb/usx2y: simplify conditional

[Takashi Iwai]

At Tue, 5 Oct 2010 17:38:12 +0200,
Nicolas Kaiser wrote:
> 
> Simplify conditional: (a || (!a && b)) => (a || b)
> 
> Signed-off-by: Nicolas Kaiser <nikai at nikai.net>

Applied now.  Thanks.


Takashi


> ---
>  sound/usb/usx2y/usx2yhwdeppcm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
> index 2a528e5..3146a81 100644
> --- a/sound/usb/usx2y/usx2yhwdeppcm.c
> +++ b/sound/usb/usx2y/usx2yhwdeppcm.c
> @@ -54,7 +54,7 @@
>  #include <linux/gfp.h>
>  #include "usbusx2yaudio.c"
>  
> -#if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) &&  USX2Y_NRPACKS == 1)
> +#if defined(USX2Y_NRPACKS_VARIABLE) || USX2Y_NRPACKS == 1
>  
>  #include <sound/hwdep.h>
>  
> -- 
> 1.7.2.2
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>