diff options
Diffstat (limited to 'sound/oss/via82cxxx_audio.c')
-rw-r--r-- | sound/oss/via82cxxx_audio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index 1a921ee71aba..29a6e0cff79f 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/fs.h> | 24 | #include <linux/fs.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
27 | #include <linux/poison.h> | ||
27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
28 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
29 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
@@ -308,7 +309,7 @@ struct via_info { | |||
308 | unsigned sixchannel: 1; /* 8233/35 with 6 channel support */ | 309 | unsigned sixchannel: 1; /* 8233/35 with 6 channel support */ |
309 | unsigned volume: 1; | 310 | unsigned volume: 1; |
310 | 311 | ||
311 | int locked_rate : 1; | 312 | unsigned locked_rate : 1; |
312 | 313 | ||
313 | int mixer_vol; /* 8233/35 volume - not yet implemented */ | 314 | int mixer_vol; /* 8233/35 volume - not yet implemented */ |
314 | 315 | ||
@@ -3522,7 +3523,7 @@ err_out_have_mixer: | |||
3522 | 3523 | ||
3523 | err_out_kfree: | 3524 | err_out_kfree: |
3524 | #ifndef VIA_NDEBUG | 3525 | #ifndef VIA_NDEBUG |
3525 | memset (card, 0xAB, sizeof (*card)); /* poison memory */ | 3526 | memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */ |
3526 | #endif | 3527 | #endif |
3527 | kfree (card); | 3528 | kfree (card); |
3528 | 3529 | ||
@@ -3559,7 +3560,7 @@ static void __devexit via_remove_one (struct pci_dev *pdev) | |||
3559 | via_ac97_cleanup (card); | 3560 | via_ac97_cleanup (card); |
3560 | 3561 | ||
3561 | #ifndef VIA_NDEBUG | 3562 | #ifndef VIA_NDEBUG |
3562 | memset (card, 0xAB, sizeof (*card)); /* poison memory */ | 3563 | memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */ |
3563 | #endif | 3564 | #endif |
3564 | kfree (card); | 3565 | kfree (card); |
3565 | 3566 | ||