Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aa3d75d80de464cf23af1d068a5e22f1527b6957

Authored by Takashi Iwai
Committed by Takashi Iwai
1 parent 51721f70ac
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ALSA: pdaudiocf - Fix missing free in the error path 

Added the missing snd_card_free() in the error path of probe callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 3 additions and 1 deletions Inline Diff

sound/pcmcia/pdaudiocf/pdaudiocf.c
Diff comments   View file @ aa3d75d
1 /* 1 /*
2 * Driver for Sound Core PDAudioCF soundcard 2 * Driver for Sound Core PDAudioCF soundcard
3 * 3 *
4 * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz> 4 * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21 #include <sound/core.h> 21 #include <sound/core.h>
22 #include <linux/slab.h> 22 #include <linux/slab.h>
23 #include <linux/moduleparam.h> 23 #include <linux/moduleparam.h>
24 #include <pcmcia/ciscode.h> 24 #include <pcmcia/ciscode.h>
25 #include <pcmcia/cisreg.h> 25 #include <pcmcia/cisreg.h>
26 #include "pdaudiocf.h" 26 #include "pdaudiocf.h"
27 #include <sound/initval.h> 27 #include <sound/initval.h>
28 #include <linux/init.h> 28 #include <linux/init.h>
29 29
30 /* 30 /*
31 */ 31 */
32 32
33 #define CARD_NAME "PDAudio-CF" 33 #define CARD_NAME "PDAudio-CF"
34 34
35 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); 35 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
36 MODULE_DESCRIPTION("Sound Core " CARD_NAME); 36 MODULE_DESCRIPTION("Sound Core " CARD_NAME);
37 MODULE_LICENSE("GPL"); 37 MODULE_LICENSE("GPL");
38 MODULE_SUPPORTED_DEVICE("{{Sound Core," CARD_NAME "}}"); 38 MODULE_SUPPORTED_DEVICE("{{Sound Core," CARD_NAME "}}");
39 39
40 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 40 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
41 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ 41 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
42 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */ 42 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */
43 43
44 module_param_array(index, int, NULL, 0444); 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, 0444); 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, 0444); 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 /* 51 /*
52 */ 52 */
53 53
54 static struct snd_card *card_list[SNDRV_CARDS]; 54 static struct snd_card *card_list[SNDRV_CARDS];
55 55
56 /* 56 /*
57 * prototypes 57 * prototypes
58 */ 58 */
59 static int pdacf_config(struct pcmcia_device *link); 59 static int pdacf_config(struct pcmcia_device *link);
60 static void snd_pdacf_detach(struct pcmcia_device *p_dev); 60 static void snd_pdacf_detach(struct pcmcia_device *p_dev);
61 61
62 static void pdacf_release(struct pcmcia_device *link) 62 static void pdacf_release(struct pcmcia_device *link)
63 { 63 {
64 pcmcia_disable_device(link); 64 pcmcia_disable_device(link);
65 } 65 }
66 66
67 /* 67 /*
68 * destructor 68 * destructor
69 */ 69 */
70 static int snd_pdacf_free(struct snd_pdacf *pdacf) 70 static int snd_pdacf_free(struct snd_pdacf *pdacf)
71 { 71 {
72 struct pcmcia_device *link = pdacf->p_dev; 72 struct pcmcia_device *link = pdacf->p_dev;
73 73
74 pdacf_release(link); 74 pdacf_release(link);
75 75
76 card_list[pdacf->index] = NULL; 76 card_list[pdacf->index] = NULL;
77 pdacf->card = NULL; 77 pdacf->card = NULL;
78 78
79 kfree(pdacf); 79 kfree(pdacf);
80 return 0; 80 return 0;
81 } 81 }
82 82
83 static int snd_pdacf_dev_free(struct snd_device *device) 83 static int snd_pdacf_dev_free(struct snd_device *device)
84 { 84 {
85 struct snd_pdacf *chip = device->device_data; 85 struct snd_pdacf *chip = device->device_data;
86 return snd_pdacf_free(chip); 86 return snd_pdacf_free(chip);
87 } 87 }
88 88
89 /* 89 /*
90 * snd_pdacf_attach - attach callback for cs 90 * snd_pdacf_attach - attach callback for cs
91 */ 91 */
92 static int snd_pdacf_probe(struct pcmcia_device *link) 92 static int snd_pdacf_probe(struct pcmcia_device *link)
93 { 93 {
94 int i, err; 94 int i, err;
95 struct snd_pdacf *pdacf; 95 struct snd_pdacf *pdacf;
96 struct snd_card *card; 96 struct snd_card *card;
97 static struct snd_device_ops ops = { 97 static struct snd_device_ops ops = {
98 .dev_free = snd_pdacf_dev_free, 98 .dev_free = snd_pdacf_dev_free,
99 }; 99 };
100 100
101 snd_printdd(KERN_DEBUG "pdacf_attach called\n"); 101 snd_printdd(KERN_DEBUG "pdacf_attach called\n");
102 /* find an empty slot from the card list */ 102 /* find an empty slot from the card list */
103 for (i = 0; i < SNDRV_CARDS; i++) { 103 for (i = 0; i < SNDRV_CARDS; i++) {
104 if (! card_list[i]) 104 if (! card_list[i])
105 break; 105 break;
106 } 106 }
107 if (i >= SNDRV_CARDS) { 107 if (i >= SNDRV_CARDS) {
108 snd_printk(KERN_ERR "pdacf: too many cards found\n"); 108 snd_printk(KERN_ERR "pdacf: too many cards found\n");
109 return -EINVAL; 109 return -EINVAL;
110 } 110 }
111 if (! enable[i]) 111 if (! enable[i])
112 return -ENODEV; /* disabled explicitly */ 112 return -ENODEV; /* disabled explicitly */
113 113
114 /* ok, create a card instance */ 114 /* ok, create a card instance */
115 err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); 115 err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card);
116 if (err < 0) { 116 if (err < 0) {
117 snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); 117 snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");
118 return err; 118 return err;
119 } 119 }
120 120
121 pdacf = snd_pdacf_create(card); 121 pdacf = snd_pdacf_create(card);
122 if (! pdacf) 122 if (!pdacf) {
123 snd_card_free(card);
123 return -EIO; 124 return -EIO;
125 }
124 126
125 if (snd_device_new(card, SNDRV_DEV_LOWLEVEL, pdacf, &ops) < 0) { 127 if (snd_device_new(card, SNDRV_DEV_LOWLEVEL, pdacf, &ops) < 0) {
126 kfree(pdacf); 128 kfree(pdacf);
127 snd_card_free(card); 129 snd_card_free(card);
128 return -ENODEV; 130 return -ENODEV;
129 } 131 }
130 132
131 snd_card_set_dev(card, &handle_to_dev(link)); 133 snd_card_set_dev(card, &handle_to_dev(link));
132 134
133 pdacf->index = i; 135 pdacf->index = i;
134 card_list[i] = card; 136 card_list[i] = card;
135 137
136 pdacf->p_dev = link; 138 pdacf->p_dev = link;
137 link->priv = pdacf; 139 link->priv = pdacf;
138 140
139 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; 141 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
140 link->io.NumPorts1 = 16; 142 link->io.NumPorts1 = 16;
141 143
142 link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT | IRQ_FORCED_PULSE; 144 link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT | IRQ_FORCED_PULSE;
143 // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; 145 // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
144 146
145 link->irq.IRQInfo1 = 0 /* | IRQ_LEVEL_ID */; 147 link->irq.IRQInfo1 = 0 /* | IRQ_LEVEL_ID */;
146 link->irq.Handler = pdacf_interrupt; 148 link->irq.Handler = pdacf_interrupt;
147 link->irq.Instance = pdacf; 149 link->irq.Instance = pdacf;
148 link->conf.Attributes = CONF_ENABLE_IRQ; 150 link->conf.Attributes = CONF_ENABLE_IRQ;
149 link->conf.IntType = INT_MEMORY_AND_IO; 151 link->conf.IntType = INT_MEMORY_AND_IO;
150 link->conf.ConfigIndex = 1; 152 link->conf.ConfigIndex = 1;
151 link->conf.Present = PRESENT_OPTION; 153 link->conf.Present = PRESENT_OPTION;
152 154
153 return pdacf_config(link); 155 return pdacf_config(link);
154 } 156 }
155 157
156 158
157 /** 159 /**
158 * snd_pdacf_assign_resources - initialize the hardware and card instance. 160 * snd_pdacf_assign_resources - initialize the hardware and card instance.
159 * @port: i/o port for the card 161 * @port: i/o port for the card
160 * @irq: irq number for the card 162 * @irq: irq number for the card
161 * 163 *
162 * this function assigns the specified port and irq, boot the card, 164 * this function assigns the specified port and irq, boot the card,
163 * create pcm and control instances, and initialize the rest hardware. 165 * create pcm and control instances, and initialize the rest hardware.
164 * 166 *
165 * returns 0 if successful, or a negative error code. 167 * returns 0 if successful, or a negative error code.
166 */ 168 */
167 static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq) 169 static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq)
168 { 170 {
169 int err; 171 int err;
170 struct snd_card *card = pdacf->card; 172 struct snd_card *card = pdacf->card;
171 173
172 snd_printdd(KERN_DEBUG "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq); 174 snd_printdd(KERN_DEBUG "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq);
173 pdacf->port = port; 175 pdacf->port = port;
174 pdacf->irq = irq; 176 pdacf->irq = irq;
175 pdacf->chip_status |= PDAUDIOCF_STAT_IS_CONFIGURED; 177 pdacf->chip_status |= PDAUDIOCF_STAT_IS_CONFIGURED;
176 178
177 err = snd_pdacf_ak4117_create(pdacf); 179 err = snd_pdacf_ak4117_create(pdacf);
178 if (err < 0) 180 if (err < 0)
179 return err; 181 return err;
180 182
181 strcpy(card->driver, "PDAudio-CF"); 183 strcpy(card->driver, "PDAudio-CF");
182 sprintf(card->shortname, "Core Sound %s", card->driver); 184 sprintf(card->shortname, "Core Sound %s", card->driver);
183 sprintf(card->longname, "%s at 0x%x, irq %i", 185 sprintf(card->longname, "%s at 0x%x, irq %i",
184 card->shortname, port, irq); 186 card->shortname, port, irq);
185 187
186 err = snd_pdacf_pcm_new(pdacf); 188 err = snd_pdacf_pcm_new(pdacf);
187 if (err < 0) 189 if (err < 0)
188 return err; 190 return err;
189 191
190 if ((err = snd_card_register(card)) < 0) 192 if ((err = snd_card_register(card)) < 0)
191 return err; 193 return err;
192 194
193 return 0; 195 return 0;
194 } 196 }
195 197
196 198
197 /* 199 /*
198 * snd_pdacf_detach - detach callback for cs 200 * snd_pdacf_detach - detach callback for cs
199 */ 201 */
200 static void snd_pdacf_detach(struct pcmcia_device *link) 202 static void snd_pdacf_detach(struct pcmcia_device *link)
201 { 203 {
202 struct snd_pdacf *chip = link->priv; 204 struct snd_pdacf *chip = link->priv;
203 205
204 snd_printdd(KERN_DEBUG "pdacf_detach called\n"); 206 snd_printdd(KERN_DEBUG "pdacf_detach called\n");
205 207
206 if (chip->chip_status & PDAUDIOCF_STAT_IS_CONFIGURED) 208 if (chip->chip_status & PDAUDIOCF_STAT_IS_CONFIGURED)
207 snd_pdacf_powerdown(chip); 209 snd_pdacf_powerdown(chip);
208 chip->chip_status |= PDAUDIOCF_STAT_IS_STALE; /* to be sure */ 210 chip->chip_status |= PDAUDIOCF_STAT_IS_STALE; /* to be sure */
209 snd_card_disconnect(chip->card); 211 snd_card_disconnect(chip->card);
210 snd_card_free_when_closed(chip->card); 212 snd_card_free_when_closed(chip->card);
211 } 213 }
212 214
213 /* 215 /*
214 * configuration callback 216 * configuration callback
215 */ 217 */
216 218
217 #define CS_CHECK(fn, ret) \ 219 #define CS_CHECK(fn, ret) \
218 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) 220 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
219 221
220 static int pdacf_config(struct pcmcia_device *link) 222 static int pdacf_config(struct pcmcia_device *link)
221 { 223 {
222 struct snd_pdacf *pdacf = link->priv; 224 struct snd_pdacf *pdacf = link->priv;
223 int last_fn, last_ret; 225 int last_fn, last_ret;
224 226
225 snd_printdd(KERN_DEBUG "pdacf_config called\n"); 227 snd_printdd(KERN_DEBUG "pdacf_config called\n");
226 link->conf.ConfigIndex = 0x5; 228 link->conf.ConfigIndex = 0x5;
227 229
228 CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); 230 CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
229 CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); 231 CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
230 CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); 232 CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
231 233
232 if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) 234 if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0)
233 goto failed; 235 goto failed;
234 236
235 link->dev_node = &pdacf->node; 237 link->dev_node = &pdacf->node;
236 return 0; 238 return 0;
237 239
238 cs_failed: 240 cs_failed:
239 cs_error(link, last_fn, last_ret); 241 cs_error(link, last_fn, last_ret);
240 failed: 242 failed:
241 pcmcia_disable_device(link); 243 pcmcia_disable_device(link);
242 return -ENODEV; 244 return -ENODEV;
243 } 245 }
244 246
245 #ifdef CONFIG_PM 247 #ifdef CONFIG_PM
246 248
247 static int pdacf_suspend(struct pcmcia_device *link) 249 static int pdacf_suspend(struct pcmcia_device *link)
248 { 250 {
249 struct snd_pdacf *chip = link->priv; 251 struct snd_pdacf *chip = link->priv;
250 252
251 snd_printdd(KERN_DEBUG "SUSPEND\n"); 253 snd_printdd(KERN_DEBUG "SUSPEND\n");
252 if (chip) { 254 if (chip) {
253 snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n"); 255 snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n");
254 snd_pdacf_suspend(chip, PMSG_SUSPEND); 256 snd_pdacf_suspend(chip, PMSG_SUSPEND);
255 } 257 }
256 258
257 return 0; 259 return 0;
258 } 260 }
259 261
260 static int pdacf_resume(struct pcmcia_device *link) 262 static int pdacf_resume(struct pcmcia_device *link)
261 { 263 {
262 struct snd_pdacf *chip = link->priv; 264 struct snd_pdacf *chip = link->priv;
263 265
264 snd_printdd(KERN_DEBUG "RESUME\n"); 266 snd_printdd(KERN_DEBUG "RESUME\n");
265 if (pcmcia_dev_present(link)) { 267 if (pcmcia_dev_present(link)) {
266 if (chip) { 268 if (chip) {
267 snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n"); 269 snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n");
268 snd_pdacf_resume(chip); 270 snd_pdacf_resume(chip);
269 } 271 }
270 } 272 }
271 snd_printdd(KERN_DEBUG "resume done!\n"); 273 snd_printdd(KERN_DEBUG "resume done!\n");
272 274
273 return 0; 275 return 0;
274 } 276 }
275 277
276 #endif 278 #endif
277 279
278 /* 280 /*
279 * Module entry points 281 * Module entry points
280 */ 282 */
281 static struct pcmcia_device_id snd_pdacf_ids[] = { 283 static struct pcmcia_device_id snd_pdacf_ids[] = {
282 /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */ 284 /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */
283 PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49), 285 PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49),
284 PCMCIA_DEVICE_NULL 286 PCMCIA_DEVICE_NULL
285 }; 287 };
286 MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids); 288 MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
287 289
288 static struct pcmcia_driver pdacf_cs_driver = { 290 static struct pcmcia_driver pdacf_cs_driver = {
289 .owner = THIS_MODULE, 291 .owner = THIS_MODULE,
290 .drv = { 292 .drv = {
291 .name = "snd-pdaudiocf", 293 .name = "snd-pdaudiocf",
292 }, 294 },
293 .probe = snd_pdacf_probe, 295 .probe = snd_pdacf_probe,
294 .remove = snd_pdacf_detach, 296 .remove = snd_pdacf_detach,
295 .id_table = snd_pdacf_ids, 297 .id_table = snd_pdacf_ids,
296 #ifdef CONFIG_PM 298 #ifdef CONFIG_PM
297 .suspend = pdacf_suspend, 299 .suspend = pdacf_suspend,
298 .resume = pdacf_resume, 300 .resume = pdacf_resume,
299 #endif 301 #endif
300 302
301 }; 303 };
302 304
303 static int __init init_pdacf(void) 305 static int __init init_pdacf(void)
304 { 306 {
305 return pcmcia_register_driver(&pdacf_cs_driver); 307 return pcmcia_register_driver(&pdacf_cs_driver);
306 } 308 }
307 309
308 static void __exit exit_pdacf(void) 310 static void __exit exit_pdacf(void)
309 { 311 {
310 pcmcia_unregister_driver(&pdacf_cs_driver); 312 pcmcia_unregister_driver(&pdacf_cs_driver);
311 } 313 }
312 314
313 module_init(init_pdacf); 315 module_init(init_pdacf);
314 module_exit(exit_pdacf); 316 module_exit(exit_pdacf);
315 317