diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
| commit | 46557bef3f3834ac33031c7be27d39d90d507442 (patch) | |
| tree | 5cfc4a9e1263fe0a15e516ca9695ee2f9b8899e4 /sound/usb/usbaudio.h | |
| parent | 4efc50d697ed8d9a91f0005d922907a7b6c9290d (diff) | |
| parent | d91d8a3f88059d93e34ac70d059153ec69a9ffc7 (diff) | |
| download | blackbird-op-linux-46557bef3f3834ac33031c7be27d39d90d507442.tar.gz blackbird-op-linux-46557bef3f3834ac33031c7be27d39d90d507442.zip | |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
Diffstat (limited to 'sound/usb/usbaudio.h')
| -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 8e7f78941ba6..e9a3a9dca15c 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info { /* */ -#define combine_word(s) ((*s) | ((unsigned int)(s)[1] << 8)) +#define combine_word(s) ((*(s)) | ((unsigned int)(s)[1] << 8)) #define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16)) #define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24)) |
