diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:49:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:49:49 +0300 |
| commit | faf5933c79545412ea63f0c3d15c261d104e1dde (patch) | |
| tree | 078b01613e5a52810eff3e8e1fd857ad08935262 /sound/usb/usbaudio.h | |
| parent | 651a88798412e216f337d70181127e847f00a4b7 (diff) | |
| parent | 24d0c9f0e7de95fe3e3e0067cbea1cd5d413244b (diff) | |
| download | linux-faf5933c79545412ea63f0c3d15c261d104e1dde.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge the 5.18-rc3 devel branch, as it influences on the further
development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 167834133b9b..b8359a0aa008 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -8,7 +8,7 @@ */ /* handling of USB vendor/product ID pairs as 32-bit numbers */ -#define USB_ID(vendor, product) (((vendor) << 16) | (product)) +#define USB_ID(vendor, product) (((unsigned int)(vendor) << 16) | (product)) #define USB_ID_VENDOR(id) ((id) >> 16) #define USB_ID_PRODUCT(id) ((u16)(id)) |