diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /sound/isa/adlib.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'sound/isa/adlib.c')
-rw-r--r-- | sound/isa/adlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c index d2654554373..7465ae036e0 100644 --- a/sound/isa/adlib.c +++ b/sound/isa/adlib.c | |||
@@ -18,7 +18,7 @@ MODULE_LICENSE("GPL"); | |||
18 | 18 | ||
19 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 19 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
20 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 20 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
21 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; | 21 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; |
22 | static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; | 22 | static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; |
23 | 23 | ||
24 | module_param_array(index, int, NULL, 0444); | 24 | module_param_array(index, int, NULL, 0444); |
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); | |||
30 | module_param_array(port, long, NULL, 0444); | 30 | module_param_array(port, long, NULL, 0444); |
31 | MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); | 31 | MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); |
32 | 32 | ||
33 | static int snd_adlib_match(struct device *dev, unsigned int n) | 33 | static int __devinit snd_adlib_match(struct device *dev, unsigned int n) |
34 | { | 34 | { |
35 | if (!enable[n]) | 35 | if (!enable[n]) |
36 | return 0; | 36 | return 0; |
@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card) | |||
47 | release_and_free_resource(card->private_data); | 47 | release_and_free_resource(card->private_data); |
48 | } | 48 | } |
49 | 49 | ||
50 | static int snd_adlib_probe(struct device *dev, unsigned int n) | 50 | static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) |
51 | { | 51 | { |
52 | struct snd_card *card; | 52 | struct snd_card *card; |
53 | struct snd_opl3 *opl3; | 53 | struct snd_opl3 *opl3; |
@@ -98,7 +98,7 @@ out: snd_card_free(card); | |||
98 | return error; | 98 | return error; |
99 | } | 99 | } |
100 | 100 | ||
101 | static int snd_adlib_remove(struct device *dev, unsigned int n) | 101 | static int __devexit snd_adlib_remove(struct device *dev, unsigned int n) |
102 | { | 102 | { |
103 | snd_card_free(dev_get_drvdata(dev)); | 103 | snd_card_free(dev_get_drvdata(dev)); |
104 | dev_set_drvdata(dev, NULL); | 104 | dev_set_drvdata(dev, NULL); |
@@ -108,7 +108,7 @@ static int snd_adlib_remove(struct device *dev, unsigned int n) | |||
108 | static struct isa_driver snd_adlib_driver = { | 108 | static struct isa_driver snd_adlib_driver = { |
109 | .match = snd_adlib_match, | 109 | .match = snd_adlib_match, |
110 | .probe = snd_adlib_probe, | 110 | .probe = snd_adlib_probe, |
111 | .remove = snd_adlib_remove, | 111 | .remove = __devexit_p(snd_adlib_remove), |
112 | 112 | ||
113 | .driver = { | 113 | .driver = { |
114 | .name = DEV_NAME | 114 | .name = DEV_NAME |