|
@@ -1027,7 +1027,8 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)
|
|
static ssize_t show_pcm_class(struct device *dev,
|
|
static ssize_t show_pcm_class(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
{
|
|
- struct snd_pcm *pcm;
|
|
|
|
|
|
+ struct snd_pcm_str *pstr = container_of(dev, struct snd_pcm_str, dev);
|
|
|
|
+ struct snd_pcm *pcm = pstr->pcm;
|
|
const char *str;
|
|
const char *str;
|
|
static const char *strs[SNDRV_PCM_CLASS_LAST + 1] = {
|
|
static const char *strs[SNDRV_PCM_CLASS_LAST + 1] = {
|
|
[SNDRV_PCM_CLASS_GENERIC] = "generic",
|
|
[SNDRV_PCM_CLASS_GENERIC] = "generic",
|
|
@@ -1036,8 +1037,7 @@ static ssize_t show_pcm_class(struct device *dev,
|
|
[SNDRV_PCM_CLASS_DIGITIZER] = "digitizer",
|
|
[SNDRV_PCM_CLASS_DIGITIZER] = "digitizer",
|
|
};
|
|
};
|
|
|
|
|
|
- if (! (pcm = dev_get_drvdata(dev)) ||
|
|
|
|
- pcm->dev_class > SNDRV_PCM_CLASS_LAST)
|
|
|
|
|
|
+ if (pcm->dev_class > SNDRV_PCM_CLASS_LAST)
|
|
str = "none";
|
|
str = "none";
|
|
else
|
|
else
|
|
str = strs[pcm->dev_class];
|
|
str = strs[pcm->dev_class];
|