[alsa-devel] [PATCH 1/2] ALSA: ctl: evaluate macro instead of numerical value

[Takashi Iwai]

At Fri, 10 Apr 2015 09:49:48 +0200,
Takashi Iwai wrote:
> 
> At Fri, 10 Apr 2015 08:43:00 +0900,
> Takashi Sakamoto wrote:
> > @@ -1430,7 +1433,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
> >  			return 0;
> >  		}
> >  	} else {
> > -		if (op_flag) {
> > +		if (op_flag != SNDRV_CTL_ELEM_ACCESS_TLV_READ) {

Grrr, this must be SNDRV_CTL_TLV_OP_READ.  Fixed by the patch below.


Takashi

-- 8< --
From: Takashi Iwai <tiwai at suse.de>
Subject: [PATCH] ALSA: control: Fix a typo of SNDRV_CTL_ELEM_ACCESS_TLV_* with
 SNDRV_CTL_TLV_OP_*

The commit [39d118677baa: ALSA: ctl: evaluate macro instead of
numerical value] replaced the numbers with constants, but one place
was replaced wrongly with a different type.  Fixed now.

Fixes: 39d118677baa ('ALSA: ctl: evaluate macro instead of numerical value')
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/core/control.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/core/control.c b/sound/core/control.c
index ccb1ca26a71e..be5b97cd8dc3 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1432,7 +1432,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
 			return 0;
 		}
 	} else {
-		if (op_flag != SNDRV_CTL_ELEM_ACCESS_TLV_READ) {
+		if (op_flag != SNDRV_CTL_TLV_OP_READ) {
 			err = -ENXIO;
 			goto __kctl_end;
 		}
-- 
2.3.5