projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7d22cc)
ALSA: sound/usb/usx2y: simplify conditional
authorNicolas Kaiser <nikai@nikai.net>
Tue, 5 Oct 2010 15:38:12 +0000 (17:38 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:50:10 +0000 (13:50 +0200)
Simplify conditional: (a || (!a && b)) => (a || b)

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/usx2y/usx2yhwdeppcm.c patch | blob | blame | history

diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 2a528e56afd50db1c7f7cb309e1734c826cef3c2..3146a816068bb6974328fcf53abc8a1ed2c633fa 100644 (file)
--- 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>