]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blame - releases/2.6.36.2/staging-line6-fix-up-some-sysfs-attribute-permissions.patch
projects / thirdparty / kernel / stable-queue.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
fixes for 4.19
[thirdparty/kernel/stable-queue.git] / releases / 2.6.36.2 / staging-line6-fix-up-some-sysfs-attribute-permissions.patch
CommitLineData
ae06513c
GKH		 1From 2018845b6a169f75341f8e68ad1089cb6697cf24 Mon Sep 17 00:00:00 2001
2From: Greg Kroah-Hartman <gregkh@suse.de>
3Date: Tue, 16 Nov 2010 11:23:33 -0800
4Subject: Staging: line6: fix up some sysfs attribute permissions
5
6From: Greg Kroah-Hartman <gregkh@suse.de>
7
8commit 2018845b6a169f75341f8e68ad1089cb6697cf24 and
92018845b6a169f75341f8e68ad1089cb6697cf24 upstream merged together as it
10had to be backported by hand.
11
12They should not be writable by any user
13
14Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
15Cc: Markus Grabner <grabner@icg.tugraz.at>
16Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
17Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18
19---
20 drivers/staging/line6/control.c | 204 +++++++++++++++++++--------------------
21 drivers/staging/line6/midi.c | 4
22 drivers/staging/line6/pod.c | 32 +++---
23 drivers/staging/line6/toneport.c | 4
24 drivers/staging/line6/variax.c | 12 +-
25 5 files changed, 128 insertions(+), 128 deletions(-)
26
27--- a/drivers/staging/line6/control.c
28+++ b/drivers/staging/line6/control.c
29@@ -268,210 +268,210 @@ VARIAX_PARAM_R(float, mix2);
30 VARIAX_PARAM_R(float, mix1);
31 VARIAX_PARAM_R(int, pickup_wiring);
32
33-static DEVICE_ATTR(tweak, S_IWUGO | S_IRUGO, pod_get_tweak, pod_set_tweak);
34-static DEVICE_ATTR(wah_position, S_IWUGO | S_IRUGO, pod_get_wah_position,
35+static DEVICE_ATTR(tweak, S_IWUSR | S_IRUGO, pod_get_tweak, pod_set_tweak);
36+static DEVICE_ATTR(wah_position, S_IWUSR | S_IRUGO, pod_get_wah_position,
37 pod_set_wah_position);
38-static DEVICE_ATTR(compression_gain, S_IWUGO | S_IRUGO,
39+static DEVICE_ATTR(compression_gain, S_IWUSR | S_IRUGO,
40 pod_get_compression_gain, pod_set_compression_gain);
41-static DEVICE_ATTR(vol_pedal_position, S_IWUGO | S_IRUGO,
42+static DEVICE_ATTR(vol_pedal_position, S_IWUSR | S_IRUGO,
43 pod_get_vol_pedal_position, pod_set_vol_pedal_position);
44-static DEVICE_ATTR(compression_threshold, S_IWUGO | S_IRUGO,
45+static DEVICE_ATTR(compression_threshold, S_IWUSR | S_IRUGO,
46 pod_get_compression_threshold,
47 pod_set_compression_threshold);
48-static DEVICE_ATTR(pan, S_IWUGO | S_IRUGO, pod_get_pan, pod_set_pan);
49-static DEVICE_ATTR(amp_model_setup, S_IWUGO | S_IRUGO, pod_get_amp_model_setup,
50+static DEVICE_ATTR(pan, S_IWUSR | S_IRUGO, pod_get_pan, pod_set_pan);
51+static DEVICE_ATTR(amp_model_setup, S_IWUSR | S_IRUGO, pod_get_amp_model_setup,
52 pod_set_amp_model_setup);
53-static DEVICE_ATTR(amp_model, S_IWUGO | S_IRUGO, pod_get_amp_model,
54+static DEVICE_ATTR(amp_model, S_IWUSR | S_IRUGO, pod_get_amp_model,
55 pod_set_amp_model);
56-static DEVICE_ATTR(drive, S_IWUGO | S_IRUGO, pod_get_drive, pod_set_drive);
57-static DEVICE_ATTR(bass, S_IWUGO | S_IRUGO, pod_get_bass, pod_set_bass);
58-static DEVICE_ATTR(mid, S_IWUGO | S_IRUGO, pod_get_mid, pod_set_mid);
59-static DEVICE_ATTR(lowmid, S_IWUGO | S_IRUGO, pod_get_lowmid, pod_set_lowmid);
60-static DEVICE_ATTR(treble, S_IWUGO | S_IRUGO, pod_get_treble, pod_set_treble);
61-static DEVICE_ATTR(highmid, S_IWUGO | S_IRUGO, pod_get_highmid,
62+static DEVICE_ATTR(drive, S_IWUSR | S_IRUGO, pod_get_drive, pod_set_drive);
63+static DEVICE_ATTR(bass, S_IWUSR | S_IRUGO, pod_get_bass, pod_set_bass);
64+static DEVICE_ATTR(mid, S_IWUSR | S_IRUGO, pod_get_mid, pod_set_mid);
65+static DEVICE_ATTR(lowmid, S_IWUSR | S_IRUGO, pod_get_lowmid, pod_set_lowmid);
66+static DEVICE_ATTR(treble, S_IWUSR | S_IRUGO, pod_get_treble, pod_set_treble);
67+static DEVICE_ATTR(highmid, S_IWUSR | S_IRUGO, pod_get_highmid,
68 pod_set_highmid);
69-static DEVICE_ATTR(chan_vol, S_IWUGO | S_IRUGO, pod_get_chan_vol,
70+static DEVICE_ATTR(chan_vol, S_IWUSR | S_IRUGO, pod_get_chan_vol,
71 pod_set_chan_vol);
72-static DEVICE_ATTR(reverb_mix, S_IWUGO | S_IRUGO, pod_get_reverb_mix,
73+static DEVICE_ATTR(reverb_mix, S_IWUSR | S_IRUGO, pod_get_reverb_mix,
74 pod_set_reverb_mix);
75-static DEVICE_ATTR(effect_setup, S_IWUGO | S_IRUGO, pod_get_effect_setup,
76+static DEVICE_ATTR(effect_setup, S_IWUSR | S_IRUGO, pod_get_effect_setup,
77 pod_set_effect_setup);
78-static DEVICE_ATTR(band_1_frequency, S_IWUGO | S_IRUGO,
79+static DEVICE_ATTR(band_1_frequency, S_IWUSR | S_IRUGO,
80 pod_get_band_1_frequency, pod_set_band_1_frequency);
81-static DEVICE_ATTR(presence, S_IWUGO | S_IRUGO, pod_get_presence,
82+static DEVICE_ATTR(presence, S_IWUSR | S_IRUGO, pod_get_presence,
83 pod_set_presence);
84-static DEVICE_ATTR2(treble__bass, treble, S_IWUGO | S_IRUGO,
85+static DEVICE_ATTR2(treble__bass, treble, S_IWUSR | S_IRUGO,
86 pod_get_treble__bass, pod_set_treble__bass);
87-static DEVICE_ATTR(noise_gate_enable, S_IWUGO | S_IRUGO,
88+static DEVICE_ATTR(noise_gate_enable, S_IWUSR | S_IRUGO,
89 pod_get_noise_gate_enable, pod_set_noise_gate_enable);
90-static DEVICE_ATTR(gate_threshold, S_IWUGO | S_IRUGO, pod_get_gate_threshold,
91+static DEVICE_ATTR(gate_threshold, S_IWUSR | S_IRUGO, pod_get_gate_threshold,
92 pod_set_gate_threshold);
93-static DEVICE_ATTR(gate_decay_time, S_IWUGO | S_IRUGO, pod_get_gate_decay_time,
94+static DEVICE_ATTR(gate_decay_time, S_IWUSR | S_IRUGO, pod_get_gate_decay_time,
95 pod_set_gate_decay_time);
96-static DEVICE_ATTR(stomp_enable, S_IWUGO | S_IRUGO, pod_get_stomp_enable,
97+static DEVICE_ATTR(stomp_enable, S_IWUSR | S_IRUGO, pod_get_stomp_enable,
98 pod_set_stomp_enable);
99-static DEVICE_ATTR(comp_enable, S_IWUGO | S_IRUGO, pod_get_comp_enable,
100+static DEVICE_ATTR(comp_enable, S_IWUSR | S_IRUGO, pod_get_comp_enable,
101 pod_set_comp_enable);
102-static DEVICE_ATTR(stomp_time, S_IWUGO | S_IRUGO, pod_get_stomp_time,
103+static DEVICE_ATTR(stomp_time, S_IWUSR | S_IRUGO, pod_get_stomp_time,
104 pod_set_stomp_time);
105-static DEVICE_ATTR(delay_enable, S_IWUGO | S_IRUGO, pod_get_delay_enable,
106+static DEVICE_ATTR(delay_enable, S_IWUSR | S_IRUGO, pod_get_delay_enable,
107 pod_set_delay_enable);
108-static DEVICE_ATTR(mod_param_1, S_IWUGO | S_IRUGO, pod_get_mod_param_1,
109+static DEVICE_ATTR(mod_param_1, S_IWUSR | S_IRUGO, pod_get_mod_param_1,
110 pod_set_mod_param_1);
111-static DEVICE_ATTR(delay_param_1, S_IWUGO | S_IRUGO, pod_get_delay_param_1,
112+static DEVICE_ATTR(delay_param_1, S_IWUSR | S_IRUGO, pod_get_delay_param_1,
113 pod_set_delay_param_1);
114-static DEVICE_ATTR(delay_param_1_note_value, S_IWUGO | S_IRUGO,
115+static DEVICE_ATTR(delay_param_1_note_value, S_IWUSR | S_IRUGO,
116 pod_get_delay_param_1_note_value,
117 pod_set_delay_param_1_note_value);
118-static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUGO | S_IRUGO,
119+static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUSR | S_IRUGO,
120 pod_get_band_2_frequency__bass,
121 pod_set_band_2_frequency__bass);
122-static DEVICE_ATTR(delay_param_2, S_IWUGO | S_IRUGO, pod_get_delay_param_2,
123+static DEVICE_ATTR(delay_param_2, S_IWUSR | S_IRUGO, pod_get_delay_param_2,
124 pod_set_delay_param_2);
125-static DEVICE_ATTR(delay_volume_mix, S_IWUGO | S_IRUGO,
126+static DEVICE_ATTR(delay_volume_mix, S_IWUSR | S_IRUGO,
127 pod_get_delay_volume_mix, pod_set_delay_volume_mix);
128-static DEVICE_ATTR(delay_param_3, S_IWUGO | S_IRUGO, pod_get_delay_param_3,
129+static DEVICE_ATTR(delay_param_3, S_IWUSR | S_IRUGO, pod_get_delay_param_3,
130 pod_set_delay_param_3);
131-static DEVICE_ATTR(reverb_enable, S_IWUGO | S_IRUGO, pod_get_reverb_enable,
132+static DEVICE_ATTR(reverb_enable, S_IWUSR | S_IRUGO, pod_get_reverb_enable,
133 pod_set_reverb_enable);
134-static DEVICE_ATTR(reverb_type, S_IWUGO | S_IRUGO, pod_get_reverb_type,
135+static DEVICE_ATTR(reverb_type, S_IWUSR | S_IRUGO, pod_get_reverb_type,
136 pod_set_reverb_type);
137-static DEVICE_ATTR(reverb_decay, S_IWUGO | S_IRUGO, pod_get_reverb_decay,
138+static DEVICE_ATTR(reverb_decay, S_IWUSR | S_IRUGO, pod_get_reverb_decay,
139 pod_set_reverb_decay);
140-static DEVICE_ATTR(reverb_tone, S_IWUGO | S_IRUGO, pod_get_reverb_tone,
141+static DEVICE_ATTR(reverb_tone, S_IWUSR | S_IRUGO, pod_get_reverb_tone,
142 pod_set_reverb_tone);
143-static DEVICE_ATTR(reverb_pre_delay, S_IWUGO | S_IRUGO,
144+static DEVICE_ATTR(reverb_pre_delay, S_IWUSR | S_IRUGO,
145 pod_get_reverb_pre_delay, pod_set_reverb_pre_delay);
146-static DEVICE_ATTR(reverb_pre_post, S_IWUGO | S_IRUGO, pod_get_reverb_pre_post,
147+static DEVICE_ATTR(reverb_pre_post, S_IWUSR | S_IRUGO, pod_get_reverb_pre_post,
148 pod_set_reverb_pre_post);
149-static DEVICE_ATTR(band_2_frequency, S_IWUGO | S_IRUGO,
150+static DEVICE_ATTR(band_2_frequency, S_IWUSR | S_IRUGO,
151 pod_get_band_2_frequency, pod_set_band_2_frequency);
152-static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUGO | S_IRUGO,
153+static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUSR | S_IRUGO,
154 pod_get_band_3_frequency__bass,
155 pod_set_band_3_frequency__bass);
156-static DEVICE_ATTR(wah_enable, S_IWUGO | S_IRUGO, pod_get_wah_enable,
157+static DEVICE_ATTR(wah_enable, S_IWUSR | S_IRUGO, pod_get_wah_enable,
158 pod_set_wah_enable);
159-static DEVICE_ATTR(modulation_lo_cut, S_IWUGO | S_IRUGO,
160+static DEVICE_ATTR(modulation_lo_cut, S_IWUSR | S_IRUGO,
161 pod_get_modulation_lo_cut, pod_set_modulation_lo_cut);
162-static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUGO | S_IRUGO,
163+static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUSR | S_IRUGO,
164 pod_get_delay_reverb_lo_cut, pod_set_delay_reverb_lo_cut);
165-static DEVICE_ATTR(volume_pedal_minimum, S_IWUGO | S_IRUGO,
166+static DEVICE_ATTR(volume_pedal_minimum, S_IWUSR | S_IRUGO,
167 pod_get_volume_pedal_minimum, pod_set_volume_pedal_minimum);
168-static DEVICE_ATTR(eq_pre_post, S_IWUGO | S_IRUGO, pod_get_eq_pre_post,
169+static DEVICE_ATTR(eq_pre_post, S_IWUSR | S_IRUGO, pod_get_eq_pre_post,
170 pod_set_eq_pre_post);
171-static DEVICE_ATTR(volume_pre_post, S_IWUGO | S_IRUGO, pod_get_volume_pre_post,
172+static DEVICE_ATTR(volume_pre_post, S_IWUSR | S_IRUGO, pod_get_volume_pre_post,
173 pod_set_volume_pre_post);
174-static DEVICE_ATTR(di_model, S_IWUGO | S_IRUGO, pod_get_di_model,
175+static DEVICE_ATTR(di_model, S_IWUSR | S_IRUGO, pod_get_di_model,
176 pod_set_di_model);
177-static DEVICE_ATTR(di_delay, S_IWUGO | S_IRUGO, pod_get_di_delay,
178+static DEVICE_ATTR(di_delay, S_IWUSR | S_IRUGO, pod_get_di_delay,
179 pod_set_di_delay);
180-static DEVICE_ATTR(mod_enable, S_IWUGO | S_IRUGO, pod_get_mod_enable,
181+static DEVICE_ATTR(mod_enable, S_IWUSR | S_IRUGO, pod_get_mod_enable,
182 pod_set_mod_enable);
183-static DEVICE_ATTR(mod_param_1_note_value, S_IWUGO | S_IRUGO,
184+static DEVICE_ATTR(mod_param_1_note_value, S_IWUSR | S_IRUGO,
185 pod_get_mod_param_1_note_value,
186 pod_set_mod_param_1_note_value);
187-static DEVICE_ATTR(mod_param_2, S_IWUGO | S_IRUGO, pod_get_mod_param_2,
188+static DEVICE_ATTR(mod_param_2, S_IWUSR | S_IRUGO, pod_get_mod_param_2,
189 pod_set_mod_param_2);
190-static DEVICE_ATTR(mod_param_3, S_IWUGO | S_IRUGO, pod_get_mod_param_3,
191+static DEVICE_ATTR(mod_param_3, S_IWUSR | S_IRUGO, pod_get_mod_param_3,
192 pod_set_mod_param_3);
193-static DEVICE_ATTR(mod_param_4, S_IWUGO | S_IRUGO, pod_get_mod_param_4,
194+static DEVICE_ATTR(mod_param_4, S_IWUSR | S_IRUGO, pod_get_mod_param_4,
195 pod_set_mod_param_4);
196-static DEVICE_ATTR(mod_param_5, S_IWUGO | S_IRUGO, pod_get_mod_param_5,
197+static DEVICE_ATTR(mod_param_5, S_IWUSR | S_IRUGO, pod_get_mod_param_5,
198 pod_set_mod_param_5);
199-static DEVICE_ATTR(mod_volume_mix, S_IWUGO | S_IRUGO, pod_get_mod_volume_mix,
200+static DEVICE_ATTR(mod_volume_mix, S_IWUSR | S_IRUGO, pod_get_mod_volume_mix,
201 pod_set_mod_volume_mix);
202-static DEVICE_ATTR(mod_pre_post, S_IWUGO | S_IRUGO, pod_get_mod_pre_post,
203+static DEVICE_ATTR(mod_pre_post, S_IWUSR | S_IRUGO, pod_get_mod_pre_post,
204 pod_set_mod_pre_post);
205-static DEVICE_ATTR(modulation_model, S_IWUGO | S_IRUGO,
206+static DEVICE_ATTR(modulation_model, S_IWUSR | S_IRUGO,
207 pod_get_modulation_model, pod_set_modulation_model);
208-static DEVICE_ATTR(band_3_frequency, S_IWUGO | S_IRUGO,
209+static DEVICE_ATTR(band_3_frequency, S_IWUSR | S_IRUGO,
210 pod_get_band_3_frequency, pod_set_band_3_frequency);
211-static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUGO | S_IRUGO,
212+static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUSR | S_IRUGO,
213 pod_get_band_4_frequency__bass,
214 pod_set_band_4_frequency__bass);
215-static DEVICE_ATTR(mod_param_1_double_precision, S_IWUGO | S_IRUGO,
216+static DEVICE_ATTR(mod_param_1_double_precision, S_IWUSR | S_IRUGO,
217 pod_get_mod_param_1_double_precision,
218 pod_set_mod_param_1_double_precision);
219-static DEVICE_ATTR(delay_param_1_double_precision, S_IWUGO | S_IRUGO,
220+static DEVICE_ATTR(delay_param_1_double_precision, S_IWUSR | S_IRUGO,
221 pod_get_delay_param_1_double_precision,
222 pod_set_delay_param_1_double_precision);
223-static DEVICE_ATTR(eq_enable, S_IWUGO | S_IRUGO, pod_get_eq_enable,
224+static DEVICE_ATTR(eq_enable, S_IWUSR | S_IRUGO, pod_get_eq_enable,
225 pod_set_eq_enable);
226-static DEVICE_ATTR(tap, S_IWUGO | S_IRUGO, pod_get_tap, pod_set_tap);
227-static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUGO | S_IRUGO,
228+static DEVICE_ATTR(tap, S_IWUSR | S_IRUGO, pod_get_tap, pod_set_tap);
229+static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUSR | S_IRUGO,
230 pod_get_volume_tweak_pedal_assign,
231 pod_set_volume_tweak_pedal_assign);
232-static DEVICE_ATTR(band_5_frequency, S_IWUGO | S_IRUGO,
233+static DEVICE_ATTR(band_5_frequency, S_IWUSR | S_IRUGO,
234 pod_get_band_5_frequency, pod_set_band_5_frequency);
235-static DEVICE_ATTR(tuner, S_IWUGO | S_IRUGO, pod_get_tuner, pod_set_tuner);
236-static DEVICE_ATTR(mic_selection, S_IWUGO | S_IRUGO, pod_get_mic_selection,
237+static DEVICE_ATTR(tuner, S_IWUSR | S_IRUGO, pod_get_tuner, pod_set_tuner);
238+static DEVICE_ATTR(mic_selection, S_IWUSR | S_IRUGO, pod_get_mic_selection,
239 pod_set_mic_selection);
240-static DEVICE_ATTR(cabinet_model, S_IWUGO | S_IRUGO, pod_get_cabinet_model,
241+static DEVICE_ATTR(cabinet_model, S_IWUSR | S_IRUGO, pod_get_cabinet_model,
242 pod_set_cabinet_model);
243-static DEVICE_ATTR(stomp_model, S_IWUGO | S_IRUGO, pod_get_stomp_model,
244+static DEVICE_ATTR(stomp_model, S_IWUSR | S_IRUGO, pod_get_stomp_model,
245 pod_set_stomp_model);
246-static DEVICE_ATTR(roomlevel, S_IWUGO | S_IRUGO, pod_get_roomlevel,
247+static DEVICE_ATTR(roomlevel, S_IWUSR | S_IRUGO, pod_get_roomlevel,
248 pod_set_roomlevel);
249-static DEVICE_ATTR(band_4_frequency, S_IWUGO | S_IRUGO,
250+static DEVICE_ATTR(band_4_frequency, S_IWUSR | S_IRUGO,
251 pod_get_band_4_frequency, pod_set_band_4_frequency);
252-static DEVICE_ATTR(band_6_frequency, S_IWUGO | S_IRUGO,
253+static DEVICE_ATTR(band_6_frequency, S_IWUSR | S_IRUGO,
254 pod_get_band_6_frequency, pod_set_band_6_frequency);
255-static DEVICE_ATTR(stomp_param_1_note_value, S_IWUGO | S_IRUGO,
256+static DEVICE_ATTR(stomp_param_1_note_value, S_IWUSR | S_IRUGO,
257 pod_get_stomp_param_1_note_value,
258 pod_set_stomp_param_1_note_value);
259-static DEVICE_ATTR(stomp_param_2, S_IWUGO | S_IRUGO, pod_get_stomp_param_2,
260+static DEVICE_ATTR(stomp_param_2, S_IWUSR | S_IRUGO, pod_get_stomp_param_2,
261 pod_set_stomp_param_2);
262-static DEVICE_ATTR(stomp_param_3, S_IWUGO | S_IRUGO, pod_get_stomp_param_3,
263+static DEVICE_ATTR(stomp_param_3, S_IWUSR | S_IRUGO, pod_get_stomp_param_3,
264 pod_set_stomp_param_3);
265-static DEVICE_ATTR(stomp_param_4, S_IWUGO | S_IRUGO, pod_get_stomp_param_4,
266+static DEVICE_ATTR(stomp_param_4, S_IWUSR | S_IRUGO, pod_get_stomp_param_4,
267 pod_set_stomp_param_4);
268-static DEVICE_ATTR(stomp_param_5, S_IWUGO | S_IRUGO, pod_get_stomp_param_5,
269+static DEVICE_ATTR(stomp_param_5, S_IWUSR | S_IRUGO, pod_get_stomp_param_5,
270 pod_set_stomp_param_5);
271-static DEVICE_ATTR(stomp_param_6, S_IWUGO | S_IRUGO, pod_get_stomp_param_6,
272+static DEVICE_ATTR(stomp_param_6, S_IWUSR | S_IRUGO, pod_get_stomp_param_6,
273 pod_set_stomp_param_6);
274-static DEVICE_ATTR(amp_switch_select, S_IWUGO | S_IRUGO,
275+static DEVICE_ATTR(amp_switch_select, S_IWUSR | S_IRUGO,
276 pod_get_amp_switch_select, pod_set_amp_switch_select);
277-static DEVICE_ATTR(delay_param_4, S_IWUGO | S_IRUGO, pod_get_delay_param_4,
278+static DEVICE_ATTR(delay_param_4, S_IWUSR | S_IRUGO, pod_get_delay_param_4,
279 pod_set_delay_param_4);
280-static DEVICE_ATTR(delay_param_5, S_IWUGO | S_IRUGO, pod_get_delay_param_5,
281+static DEVICE_ATTR(delay_param_5, S_IWUSR | S_IRUGO, pod_get_delay_param_5,
282 pod_set_delay_param_5);
283-static DEVICE_ATTR(delay_pre_post, S_IWUGO | S_IRUGO, pod_get_delay_pre_post,
284+static DEVICE_ATTR(delay_pre_post, S_IWUSR | S_IRUGO, pod_get_delay_pre_post,
285 pod_set_delay_pre_post);
286-static DEVICE_ATTR(delay_model, S_IWUGO | S_IRUGO, pod_get_delay_model,
287+static DEVICE_ATTR(delay_model, S_IWUSR | S_IRUGO, pod_get_delay_model,
288 pod_set_delay_model);
289-static DEVICE_ATTR(delay_verb_model, S_IWUGO | S_IRUGO,
290+static DEVICE_ATTR(delay_verb_model, S_IWUSR | S_IRUGO,
291 pod_get_delay_verb_model, pod_set_delay_verb_model);
292-static DEVICE_ATTR(tempo_msb, S_IWUGO | S_IRUGO, pod_get_tempo_msb,
293+static DEVICE_ATTR(tempo_msb, S_IWUSR | S_IRUGO, pod_get_tempo_msb,
294 pod_set_tempo_msb);
295-static DEVICE_ATTR(tempo_lsb, S_IWUGO | S_IRUGO, pod_get_tempo_lsb,
296+static DEVICE_ATTR(tempo_lsb, S_IWUSR | S_IRUGO, pod_get_tempo_lsb,
297 pod_set_tempo_lsb);
298-static DEVICE_ATTR(wah_model, S_IWUGO | S_IRUGO, pod_get_wah_model,
299+static DEVICE_ATTR(wah_model, S_IWUSR | S_IRUGO, pod_get_wah_model,
300 pod_set_wah_model);
301-static DEVICE_ATTR(bypass_volume, S_IWUGO | S_IRUGO, pod_get_bypass_volume,
302+static DEVICE_ATTR(bypass_volume, S_IWUSR | S_IRUGO, pod_get_bypass_volume,
303 pod_set_bypass_volume);
304-static DEVICE_ATTR(fx_loop_on_off, S_IWUGO | S_IRUGO, pod_get_fx_loop_on_off,
305+static DEVICE_ATTR(fx_loop_on_off, S_IWUSR | S_IRUGO, pod_get_fx_loop_on_off,
306 pod_set_fx_loop_on_off);
307-static DEVICE_ATTR(tweak_param_select, S_IWUGO | S_IRUGO,
308+static DEVICE_ATTR(tweak_param_select, S_IWUSR | S_IRUGO,
309 pod_get_tweak_param_select, pod_set_tweak_param_select);
310-static DEVICE_ATTR(amp1_engage, S_IWUGO | S_IRUGO, pod_get_amp1_engage,
311+static DEVICE_ATTR(amp1_engage, S_IWUSR | S_IRUGO, pod_get_amp1_engage,
312 pod_set_amp1_engage);
313-static DEVICE_ATTR(band_1_gain, S_IWUGO | S_IRUGO, pod_get_band_1_gain,
314+static DEVICE_ATTR(band_1_gain, S_IWUSR | S_IRUGO, pod_get_band_1_gain,
315 pod_set_band_1_gain);
316-static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUGO | S_IRUGO,
317+static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUSR | S_IRUGO,
318 pod_get_band_2_gain__bass, pod_set_band_2_gain__bass);
319-static DEVICE_ATTR(band_2_gain, S_IWUGO | S_IRUGO, pod_get_band_2_gain,
320+static DEVICE_ATTR(band_2_gain, S_IWUSR | S_IRUGO, pod_get_band_2_gain,
321 pod_set_band_2_gain);
322-static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUGO | S_IRUGO,
323+static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUSR | S_IRUGO,
324 pod_get_band_3_gain__bass, pod_set_band_3_gain__bass);
325-static DEVICE_ATTR(band_3_gain, S_IWUGO | S_IRUGO, pod_get_band_3_gain,
326+static DEVICE_ATTR(band_3_gain, S_IWUSR | S_IRUGO, pod_get_band_3_gain,
327 pod_set_band_3_gain);
328-static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUGO | S_IRUGO,
329+static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUSR | S_IRUGO,
330 pod_get_band_4_gain__bass, pod_set_band_4_gain__bass);
331-static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUGO | S_IRUGO,
332+static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUSR | S_IRUGO,
333 pod_get_band_5_gain__bass, pod_set_band_5_gain__bass);
334-static DEVICE_ATTR(band_4_gain, S_IWUGO | S_IRUGO, pod_get_band_4_gain,
335+static DEVICE_ATTR(band_4_gain, S_IWUSR | S_IRUGO, pod_get_band_4_gain,
336 pod_set_band_4_gain);
337-static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUGO | S_IRUGO,
338+static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUSR | S_IRUGO,
339 pod_get_band_6_gain__bass, pod_set_band_6_gain__bass);
340 static DEVICE_ATTR(body, S_IRUGO, variax_get_body, line6_nop_write);
341 static DEVICE_ATTR(pickup1_enable, S_IRUGO, variax_get_pickup1_enable,
342--- a/drivers/staging/line6/midi.c
343+++ b/drivers/staging/line6/midi.c
344@@ -362,8 +362,8 @@ static ssize_t midi_set_midi_mask_receiv
345 return count;
346 }
347
348-static DEVICE_ATTR(midi_mask_transmit, S_IWUGO | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit);
349-static DEVICE_ATTR(midi_mask_receive, S_IWUGO | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive);
350+static DEVICE_ATTR(midi_mask_transmit, S_IWUSR | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit);
351+static DEVICE_ATTR(midi_mask_receive, S_IWUSR | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive);
352
353 /* MIDI device destructor */
354 static int snd_line6_midi_free(struct snd_device *device)
355--- a/drivers/staging/line6/pod.c
356+++ b/drivers/staging/line6/pod.c
357@@ -952,33 +952,33 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1, 1);
358 #undef GET_SYSTEM_PARAM
359
360 /* POD special files: */
361-static DEVICE_ATTR(channel, S_IWUGO | S_IRUGO, pod_get_channel, pod_set_channel);
362+static DEVICE_ATTR(channel, S_IWUSR | S_IRUGO, pod_get_channel, pod_set_channel);
363 static DEVICE_ATTR(clip, S_IRUGO, pod_wait_for_clip, line6_nop_write);
364 static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
365 static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write);
366-static DEVICE_ATTR(dump, S_IWUGO | S_IRUGO, pod_get_dump, pod_set_dump);
367-static DEVICE_ATTR(dump_buf, S_IWUGO | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf);
368-static DEVICE_ATTR(finish, S_IWUGO, line6_nop_read, pod_set_finish);
369+static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump);
370+static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf);
371+static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish);
372 static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version, line6_nop_write);
373-static DEVICE_ATTR(midi_postprocess, S_IWUGO | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess);
374-static DEVICE_ATTR(monitor_level, S_IWUGO | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level);
375+static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess);
376+static DEVICE_ATTR(monitor_level, S_IWUSR | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level);
377 static DEVICE_ATTR(name, S_IRUGO, pod_get_name, line6_nop_write);
378 static DEVICE_ATTR(name_buf, S_IRUGO, pod_get_name_buf, line6_nop_write);
379-static DEVICE_ATTR(retrieve_amp_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_amp_setup);
380-static DEVICE_ATTR(retrieve_channel, S_IWUGO, line6_nop_read, pod_set_retrieve_channel);
381-static DEVICE_ATTR(retrieve_effects_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_effects_setup);
382-static DEVICE_ATTR(routing, S_IWUGO | S_IRUGO, pod_get_routing, pod_set_routing);
383+static DEVICE_ATTR(retrieve_amp_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_amp_setup);
384+static DEVICE_ATTR(retrieve_channel, S_IWUSR, line6_nop_read, pod_set_retrieve_channel);
385+static DEVICE_ATTR(retrieve_effects_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_effects_setup);
386+static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing, pod_set_routing);
387 static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number, line6_nop_write);
388-static DEVICE_ATTR(store_amp_setup, S_IWUGO, line6_nop_read, pod_set_store_amp_setup);
389-static DEVICE_ATTR(store_channel, S_IWUGO, line6_nop_read, pod_set_store_channel);
390-static DEVICE_ATTR(store_effects_setup, S_IWUGO, line6_nop_read, pod_set_store_effects_setup);
391-static DEVICE_ATTR(tuner_freq, S_IWUGO | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq);
392-static DEVICE_ATTR(tuner_mute, S_IWUGO | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute);
393+static DEVICE_ATTR(store_amp_setup, S_IWUSR, line6_nop_read, pod_set_store_amp_setup);
394+static DEVICE_ATTR(store_channel, S_IWUSR, line6_nop_read, pod_set_store_channel);
395+static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read, pod_set_store_effects_setup);
396+static DEVICE_ATTR(tuner_freq, S_IWUSR | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq);
397+static DEVICE_ATTR(tuner_mute, S_IWUSR | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute);
398 static DEVICE_ATTR(tuner_note, S_IRUGO, pod_get_tuner_note, line6_nop_write);
399 static DEVICE_ATTR(tuner_pitch, S_IRUGO, pod_get_tuner_pitch, line6_nop_write);
400
401 #if CREATE_RAW_FILE
402-static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw);
403+static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);
404 #endif
405
406 /*
407--- a/drivers/staging/line6/toneport.c
408+++ b/drivers/staging/line6/toneport.c
409@@ -124,9 +124,9 @@ static ssize_t toneport_set_led_green(st
410 return count;
411 }
412
413-static DEVICE_ATTR(led_red, S_IWUGO | S_IRUGO, line6_nop_read,
414+static DEVICE_ATTR(led_red, S_IWUSR | S_IRUGO, line6_nop_read,
415 toneport_set_led_red);
416-static DEVICE_ATTR(led_green, S_IWUGO | S_IRUGO, line6_nop_read,
417+static DEVICE_ATTR(led_green, S_IWUSR | S_IRUGO, line6_nop_read,
418 toneport_set_led_green);
419
420 static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2)
421--- a/drivers/staging/line6/variax.c
422+++ b/drivers/staging/line6/variax.c
423@@ -389,17 +389,17 @@ static ssize_t variax_set_raw2(struct de
424 #endif
425
426 /* Variax workbench special files: */
427-static DEVICE_ATTR(model, S_IWUGO | S_IRUGO, variax_get_model, variax_set_model);
428-static DEVICE_ATTR(volume, S_IWUGO | S_IRUGO, variax_get_volume, variax_set_volume);
429-static DEVICE_ATTR(tone, S_IWUGO | S_IRUGO, variax_get_tone, variax_set_tone);
430+static DEVICE_ATTR(model, S_IWUSR | S_IRUGO, variax_get_model, variax_set_model);
431+static DEVICE_ATTR(volume, S_IWUSR | S_IRUGO, variax_get_volume, variax_set_volume);
432+static DEVICE_ATTR(tone, S_IWUSR | S_IRUGO, variax_get_tone, variax_set_tone);
433 static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write);
434 static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write);
435 static DEVICE_ATTR(dump, S_IRUGO, variax_get_dump, line6_nop_write);
436-static DEVICE_ATTR(active, S_IWUGO | S_IRUGO, variax_get_active, variax_set_active);
437+static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, variax_get_active, variax_set_active);
438
439 #if CREATE_RAW_FILE
440-static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw);
441-static DEVICE_ATTR(raw2, S_IWUGO, line6_nop_read, variax_set_raw2);
442+static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);
443+static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);
444 #endif
445
446
Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git