diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /sound/drivers/opl3/opl3_lib.c | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/drivers/opl3/opl3_lib.c')
| -rw-r--r-- | sound/drivers/opl3/opl3_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c index 33d9a857a26..f66af5884c4 100644 --- a/sound/drivers/opl3/opl3_lib.c +++ b/sound/drivers/opl3/opl3_lib.c @@ -501,10 +501,8 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3, hw->private_data = opl3; hw->exclusive = 1; #ifdef CONFIG_SND_OSSEMUL - if (device == 0) { + if (device == 0) hw->oss_type = SNDRV_OSS_DEVICE_TYPE_DMFM; - sprintf(hw->oss_dev, "dmfm%i", card->number); - } #endif strcpy(hw->name, hw->id); switch (opl3->hardware & OPL3_HW_MASK) { |