aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emufx.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/emu10k1/emufx.c')
-rw-r--r--sound/pci/emu10k1/emufx.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index eb5c0aba41c1..56fc47bd6dba 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -2641,14 +2641,11 @@ static int snd_emu10k1_fx8010_release(struct snd_hwdep * hw, struct file *file)
2641 return 0; 2641 return 0;
2642} 2642}
2643 2643
2644int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, 2644int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device)
2645 struct snd_hwdep **rhwdep)
2646{ 2645{
2647 struct snd_hwdep *hw; 2646 struct snd_hwdep *hw;
2648 int err; 2647 int err;
2649 2648
2650 if (rhwdep)
2651 *rhwdep = NULL;
2652 if ((err = snd_hwdep_new(emu->card, "FX8010", device, &hw)) < 0) 2649 if ((err = snd_hwdep_new(emu->card, "FX8010", device, &hw)) < 0)
2653 return err; 2650 return err;
2654 strcpy(hw->name, "EMU10K1 (FX8010)"); 2651 strcpy(hw->name, "EMU10K1 (FX8010)");
@@ -2657,8 +2654,6 @@ int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device,
2657 hw->ops.ioctl = snd_emu10k1_fx8010_ioctl; 2654 hw->ops.ioctl = snd_emu10k1_fx8010_ioctl;
2658 hw->ops.release = snd_emu10k1_fx8010_release; 2655 hw->ops.release = snd_emu10k1_fx8010_release;
2659 hw->private_data = emu; 2656 hw->private_data = emu;
2660 if (rhwdep)
2661 *rhwdep = hw;
2662 return 0; 2657 return 0;
2663} 2658}
2664 2659