diff options
| author | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
| commit | 1bf3c840b8061c526c0f442d9697311572d9cc6e (patch) | |
| tree | b6fc101b797024e47cec240b90e12864dc70fa0f /sound/oss | |
| parent | 855ee922b7f6df94a36bb8acff0a354550203e39 (diff) | |
| parent | b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff) | |
| download | kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.zip kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.gz kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.bz2 | |
Merge branch 'master' into mainline
Conflicts:
drivers/mmc/core/core.c
drivers/pwm/Kconfig
drivers/pwm/Makefile
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/kahlua.c | 2 | ||||
| -rw-r--r-- | sound/oss/vwsnd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 2a44cc1..12be1fb 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c @@ -178,7 +178,6 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_out_free: - pci_set_drvdata(pdev, NULL); kfree(hw_config); return 1; } @@ -187,7 +186,6 @@ static void remove_one(struct pci_dev *pdev) { struct address_info *hw_config = pci_get_drvdata(pdev); sb_dsp_unload(hw_config, 0); - pci_set_drvdata(pdev, NULL); kfree(hw_config); } diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 7e814a5..4bbcc0f 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c @@ -149,17 +149,19 @@ #include <linux/interrupt.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/delay.h> #include <asm/visws/cobalt.h> #include "sound_config.h" +static DEFINE_MUTEX(vwsnd_mutex); + /*****************************************************************************/ /* debug stuff */ #ifdef VWSND_DEBUG -static DEFINE_MUTEX(vwsnd_mutex); static int shut_up = 1; /* |