Skip to contentSkip to conversation

staging: &&/|| typo

PATCH Applied Roel Kluin 2 participants 2 messages Feb 15, 2009 – Feb 16, 2009 Sound

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 staging: &&/|| typo

&&/|| typo

---
// vi sound/oss/ad1848.c +83
#define MD_1845 4
...
#define MD_1845_SSCAPE 9 /* Ensoniq Soundscape PNP*/

sound/oss/ad1848.c +1 -1
index 7cf9913..a5b8356 100644
@@ -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);
Applied
#1 lore raw

At Sun, 15 Feb 2009 20:51:19 +0100,

Quoted 4 lines · Roel Kluin

&&/|| typo

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

Quoted 20 lines

---
// vi sound/oss/ad1848.c +83
#define MD_1845 4
...
#define MD_1845_SSCAPE 9 /* Ensoniq Soundscape PNP*/

sound/oss/ad1848.c +1 -1
index 7cf9913..a5b8356 100644
@@ -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);