diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
commit | e87a3dd33eab30b4db539500064a9584867e4f2c (patch) | |
tree | 2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /sound/usb/usx2y | |
parent | b14f5de731ae657d498d18d713c6431bfbeefb4b (diff) | |
parent | 3d00941371a765779c4e3509214c7e5793cce1fe (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb/usx2y')
-rw-r--r-- | sound/usb/usx2y/us122l.c | 2 | ||||
-rw-r--r-- | sound/usb/usx2y/usX2Yhwdep.c | 2 | ||||
-rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index b54e8ca360d1..00cd54c236b4 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c | |||
@@ -176,7 +176,7 @@ static void usb_stream_hwdep_vm_close(struct vm_area_struct *area) | |||
176 | snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count)); | 176 | snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count)); |
177 | } | 177 | } |
178 | 178 | ||
179 | static struct vm_operations_struct usb_stream_hwdep_vm_ops = { | 179 | static const struct vm_operations_struct usb_stream_hwdep_vm_ops = { |
180 | .open = usb_stream_hwdep_vm_open, | 180 | .open = usb_stream_hwdep_vm_open, |
181 | .fault = usb_stream_hwdep_vm_fault, | 181 | .fault = usb_stream_hwdep_vm_fault, |
182 | .close = usb_stream_hwdep_vm_close, | 182 | .close = usb_stream_hwdep_vm_close, |
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index f3d8f71265dd..52e04b2f35d3 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c | |||
@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct vm_area_struct *area, | |||
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | static struct vm_operations_struct us428ctls_vm_ops = { | 56 | static const struct vm_operations_struct us428ctls_vm_ops = { |
57 | .fault = snd_us428ctls_vm_fault, | 57 | .fault = snd_us428ctls_vm_fault, |
58 | }; | 58 | }; |
59 | 59 | ||
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 117946f2debb..4b2304c2e02d 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c | |||
@@ -697,7 +697,7 @@ static int snd_usX2Y_hwdep_pcm_vm_fault(struct vm_area_struct *area, | |||
697 | } | 697 | } |
698 | 698 | ||
699 | 699 | ||
700 | static struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { | 700 | static const struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { |
701 | .open = snd_usX2Y_hwdep_pcm_vm_open, | 701 | .open = snd_usX2Y_hwdep_pcm_vm_open, |
702 | .close = snd_usX2Y_hwdep_pcm_vm_close, | 702 | .close = snd_usX2Y_hwdep_pcm_vm_close, |
703 | .fault = snd_usX2Y_hwdep_pcm_vm_fault, | 703 | .fault = snd_usX2Y_hwdep_pcm_vm_fault, |