diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:41:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-04 05:42:27 -0400 |
| commit | cdbc653a04ee692a7105a96e8dd6055d9971d45c (patch) | |
| tree | c1282680b3115edfd693a27bc6758208534ac557 /sound/drivers/mts64.c | |
| parent | 009f8c90f571d87855914dbc20e6c0ea2a3b19ae (diff) | |
| parent | ceec4684085a9e4dc60439d84ab47ce260444804 (diff) | |
Merge branch 'for-next' into for-linus
4.18-rc1 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/mts64.c')
| -rw-r--r-- | sound/drivers/mts64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index f32e81342247..b68e71ca7abd 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c | |||
| @@ -41,11 +41,11 @@ static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | |||
| 41 | static struct platform_device *platform_devices[SNDRV_CARDS]; | 41 | static struct platform_device *platform_devices[SNDRV_CARDS]; |
| 42 | static int device_count; | 42 | static int device_count; |
| 43 | 43 | ||
| 44 | module_param_array(index, int, NULL, S_IRUGO); | 44 | module_param_array(index, int, NULL, 0444); |
| 45 | MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard."); | 45 | MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard."); |
| 46 | module_param_array(id, charp, NULL, S_IRUGO); | 46 | module_param_array(id, charp, NULL, 0444); |
| 47 | MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard."); | 47 | MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard."); |
| 48 | module_param_array(enable, bool, NULL, S_IRUGO); | 48 | module_param_array(enable, bool, NULL, 0444); |
| 49 | MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard."); | 49 | MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard."); |
| 50 | 50 | ||
| 51 | MODULE_AUTHOR("Matthias Koenig <mk@phasorlab.de>"); | 51 | MODULE_AUTHOR("Matthias Koenig <mk@phasorlab.de>"); |