diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2006-06-27 05:53:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:38 -0400 |
commit | b3c681e09193559ba15f6c9562bd37045f120a96 (patch) | |
tree | 8c70d20988e6b04171cb1f60b0da34978bca5f36 /sound/oss | |
parent | c9cf55285e87ac423c45d9efca750d3f50234d10 (diff) |
[PATCH] update two drivers for poison.h
Update two drivers to use poison.h.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/via82cxxx_audio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index 1a921ee71aba..2343dedd44ae 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> |
@@ -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 | ||