diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /sound/usb | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbaudio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 8e7f78941ba..e9a3a9dca15 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
| @@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info { | |||
| 210 | /* | 210 | /* |
| 211 | */ | 211 | */ |
| 212 | 212 | ||
| 213 | #define combine_word(s) ((*s) | ((unsigned int)(s)[1] << 8)) | 213 | #define combine_word(s) ((*(s)) | ((unsigned int)(s)[1] << 8)) |
| 214 | #define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16)) | 214 | #define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16)) |
| 215 | #define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24)) | 215 | #define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24)) |
| 216 | 216 | ||