Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

staging: bcm2835-audio: use | instead of || otherwise result is just boolean 1

The incorrect or operator is being used resulting in cookies being
set to 1 (true) rather than the intended hex value.  Fix this by
using | instead of ||.

Issue found with static analysis with cppcheck

Fixes: 0cec463e391e05b807a ("staging: bcm2835-audio: Simplify callback structure for write data")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Colin Ian King 8 years ago
parent
f440d90908
commit
7dd551e20e
1 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      drivers/staging/bcm2835-audio/bcm2835-vchiq.c

+ 2 - 2
drivers/staging/bcm2835-audio/bcm2835-vchiq.c
View File 

@@ -91,9 +91,9 @@ bcm2835_vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
 
 					 size);
 
 					 size);
 
 }
 
 }
 
 
 
-static const u32 BCM2835_AUDIO_WRITE_COOKIE1 = ('B' << 24 | 'C' << 16 ||
 
+static const u32 BCM2835_AUDIO_WRITE_COOKIE1 = ('B' << 24 | 'C' << 16 |
 
 						'M' << 8  | 'A');
 
 						'M' << 8  | 'A');
 
-static const u32 BCM2835_AUDIO_WRITE_COOKIE2 = ('D' << 24 | 'A' << 16 ||
 
+static const u32 BCM2835_AUDIO_WRITE_COOKIE2 = ('D' << 24 | 'A' << 16 |
 
 						'T' << 8  | 'A');
 
 						'T' << 8  | 'A');
 
 
 
 struct bcm2835_audio_work {
 
 struct bcm2835_audio_work {