diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
commit | d7dc450d5a7162de96edbed6b1792240c2f3a55f (patch) | |
tree | d6dc2d26b393dd69881cd4b9498718f65b35abeb /sound/usb/usx2y/usx2yhwdeppcm.c | |
parent | d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff) | |
parent | 0997e378be1d888a5d093eeee55f842cdfe55ebe (diff) |
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/usb/usx2y/usx2yhwdeppcm.c')
-rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index f95164b91152..d51c7fd7835b 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c @@ -723,7 +723,7 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card) hw->ops.release = snd_usX2Y_hwdep_pcm_release; hw->ops.mmap = snd_usX2Y_hwdep_pcm_mmap; hw->exclusive = 1; - sprintf(hw->name, "/proc/bus/usb/%03d/%03d/hwdeppcm", dev->bus->busnum, dev->devnum); + sprintf(hw->name, "/dev/bus/usb/%03d/%03d/hwdeppcm", dev->bus->busnum, dev->devnum); err = snd_pcm_new(card, NAME_ALLCAPS" hwdep Audio", 2, 1, 1, &pcm); if (err < 0) { |