diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-29 15:53:51 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-02 14:21:07 +0100 |
commit | 92b7952da8279189aad352efbf9f2e7001de9524 (patch) | |
tree | 9fbe989ba60bafdeeedae4592ffe6762d155becb /sound/core/pcm.c | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
download | linux-stable-92b7952da8279189aad352efbf9f2e7001de9524.tar.gz linux-stable-92b7952da8279189aad352efbf9f2e7001de9524.tar.bz2 linux-stable-92b7952da8279189aad352efbf9f2e7001de9524.zip |
ALSA: Allow to pass the device object to snd_register_device*()
This is a preliminary patch for the further work on embedding struct
device into each sound device instance. It changes
snd_register_device*() helpers to receive the device object directly
for skipping creating a device there.
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm.c')
-rw-r--r-- | sound/core/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index cfc56c806964..dba5180e5b80 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -1115,7 +1115,7 @@ static int snd_pcm_dev_register(struct snd_device *device) err = snd_register_device_for_dev(devtype, pcm->card, pcm->device, &snd_pcm_f_ops[cidx], - pcm, str, dev); + pcm, NULL, dev, str); if (err < 0) { list_del(&pcm->list); mutex_unlock(®ister_mutex); |