diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/usb/misc/ua101.c | |
parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/usb/misc/ua101.c')
-rw-r--r-- | sound/usb/misc/ua101.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index c19a5dd05631..386fbfd5c617 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c @@ -890,7 +890,7 @@ static snd_pcm_uframes_t playback_pcm_pointer(struct snd_pcm_substream *subs) return ua101_pcm_pointer(ua, &ua->playback); } -static struct snd_pcm_ops capture_pcm_ops = { +static const struct snd_pcm_ops capture_pcm_ops = { .open = capture_pcm_open, .close = capture_pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -903,7 +903,7 @@ static struct snd_pcm_ops capture_pcm_ops = { .mmap = snd_pcm_lib_mmap_vmalloc, }; -static struct snd_pcm_ops playback_pcm_ops = { +static const struct snd_pcm_ops playback_pcm_ops = { .open = playback_pcm_open, .close = playback_pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -1366,7 +1366,7 @@ static void ua101_disconnect(struct usb_interface *interface) mutex_unlock(&devices_mutex); } -static struct usb_device_id ua101_ids[] = { +static const struct usb_device_id ua101_ids[] = { { USB_DEVICE(0x0582, 0x0044) }, /* UA-1000 high speed */ { USB_DEVICE(0x0582, 0x007d) }, /* UA-101 high speed */ { USB_DEVICE(0x0582, 0x008d) }, /* UA-101 full speed */ |