diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-21 15:52:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:54:44 -0400 |
commit | 89409211ff97bf82295d1fb98ab18302a03e9199 (patch) | |
tree | df122211e80cb4998011bf6c4efc8e3cb8c67dc9 /sound/core | |
parent | 9def0b9761ee096c3c539b427dfb1e52b373cdad (diff) |
device create: sound: convert device_create to device_create_drvdata
device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 5c254d498ae0..df46bbc25dc2 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -548,8 +548,9 @@ int snd_card_register(struct snd_card *card) | |||
548 | snd_assert(card != NULL, return -EINVAL); | 548 | snd_assert(card != NULL, return -EINVAL); |
549 | #ifndef CONFIG_SYSFS_DEPRECATED | 549 | #ifndef CONFIG_SYSFS_DEPRECATED |
550 | if (!card->card_dev) { | 550 | if (!card->card_dev) { |
551 | card->card_dev = device_create(sound_class, card->dev, 0, | 551 | card->card_dev = device_create_drvdata(sound_class, card->dev, |
552 | "card%i", card->number); | 552 | MKDEV(0, 0), NULL, |
553 | "card%i", card->number); | ||
553 | if (IS_ERR(card->card_dev)) | 554 | if (IS_ERR(card->card_dev)) |
554 | card->card_dev = NULL; | 555 | card->card_dev = NULL; |
555 | } | 556 | } |