lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.26' into bkl-removal

Browse Source
This commit is contained in:
Jonathan Corbet
2008-07-14 15:29:34 -06:00
parent feae1ef116 bce7f793da
commit 2fceef397f
1975 changed files with 41893 additions and 19758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/core/sound.c
View File

@@ -272,8 +272,9 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
return minor;
}
snd_minors[minor] = preg;
preg->dev = device_create(sound_class, device, MKDEV(major, minor),
"%s", name);
preg->dev = device_create_drvdata(sound_class, device,
MKDEV(major, minor),
private_data, "%s", name);
if (IS_ERR(preg->dev)) {
snd_minors[minor] = NULL;
mutex_unlock(&sound_mutex);
@@ -282,9 +283,6 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
return minor;
}
if (preg->dev)
dev_set_drvdata(preg->dev, private_data);
mutex_unlock(&sound_mutex);
return 0;
}