diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-12-16 20:37:54 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-22 11:50:29 +0100 |
| commit | c582cc66b98af8130f4a26ccbd7e05d5aef2a96d (patch) | |
| tree | 78dd3836e4bd9940aef603069367d6037a5dda89 /sound | |
| parent | f67d71ae8bb18137eb1909a588879b33e06cc4c4 (diff) | |
| download | linux-stable-c582cc66b98af8130f4a26ccbd7e05d5aef2a96d.tar.gz linux-stable-c582cc66b98af8130f4a26ccbd7e05d5aef2a96d.tar.bz2 linux-stable-c582cc66b98af8130f4a26ccbd7e05d5aef2a96d.zip | |
ALSA: oxfw: enable to keep memory block for model-specific structure
ALSA oxfw driver should have backward compatibility to old
firewire-speakers driver. Additionally, in future commit, scs1x driver
will be merged. It's nice to add a pointer to have a memory block for
model-specific structures.
This commit adds a member to 'struct snd_oxfw' for this aim. Deallocation
is done at freeing ALSA card structure.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/oxfw/oxfw.c | 1 | ||||
| -rw-r--r-- | sound/firewire/oxfw/oxfw.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index d4fb3c10163a..7e50a4fcee50 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -132,6 +132,7 @@ static void oxfw_card_free(struct snd_card *card) kfree(oxfw->rx_stream_formats[i]); } + kfree(oxfw->spec); mutex_destroy(&oxfw->mutex); } diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h index f3e14fff4ba0..9625661bbe8a 100644 --- a/sound/firewire/oxfw/oxfw.h +++ b/sound/firewire/oxfw/oxfw.h @@ -74,6 +74,7 @@ struct snd_oxfw { wait_queue_head_t hwdep_wait; const struct ieee1394_device_id *entry; + void *spec; }; /* |