projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7d22cc
)
ALSA: sound/usb/usx2y: simplify conditional
author
Nicolas Kaiser
<nikai@nikai.net>
Tue, 5 Oct 2010 15:38:12 +0000
(17:38 +0200)
committer
Takashi 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
|
history
diff --git
a/sound/usb/usx2y/usx2yhwdeppcm.c
b/sound/usb/usx2y/usx2yhwdeppcm.c
index
2a528e5
..
3146a81
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>