OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: core: Fix missing card sysfs contents 

While moving the card device into struct snd_card, the reference to
the assigned card in sysfs show/store callbacks were forgotten to be
refreshed, still accessing to the no longer used drvdata.  Fix these
places to refer correctly via container_of().

Also, remove the superfluous NULL checks since it's guaranteed to be
non-NULL now.

Fixes: 8bfb181c17 ('ALSA: Embed card device into struct snd_card')
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-02-19 11:18:10 +01:00
parent dff86f86d4
commit b203dbab08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/core/init.c
View File

@ -624,15 +624,15 @@ static ssize_t
card_id_show_attr(struct device *dev, card_id_show_attr(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = container_of(dev, struct snd_card, card_dev);
return snprintf(buf, PAGE_SIZE, "%s\n", card ? card->id : "(null)"); return snprintf(buf, PAGE_SIZE, "%s\n", card->id);
} }
static ssize_t static ssize_t
card_id_store_attr(struct device *dev, struct device_attribute *attr, card_id_store_attr(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = container_of(dev, struct snd_card, card_dev);
char buf1[sizeof(card->id)]; char buf1[sizeof(card->id)];
size_t copy = count > sizeof(card->id) - 1 ? size_t copy = count > sizeof(card->id) - 1 ?
sizeof(card->id) - 1 : count; sizeof(card->id) - 1 : count;
@ -664,8 +664,8 @@ static ssize_t
card_number_show_attr(struct device *dev, card_number_show_attr(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = container_of(dev, struct snd_card, card_dev);
return snprintf(buf, PAGE_SIZE, "%i\n", card ? card->number : -1); return snprintf(buf, PAGE_SIZE, "%i\n", card->number);
} }
static DEVICE_ATTR(number, S_IRUGO, card_number_show_attr, NULL); static DEVICE_ATTR(number, S_IRUGO, card_number_show_attr, NULL);