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>

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index d4fb3c10163af05c22b1445029ed121f6219a600..7e50a4fcee505666aa96cb6c05ac88f38458d805 100644 (file)
--- 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 f3e14fff4ba07cd28277625e95123e66ff8bcf59..9625661bbe8a354cc26672bed222b111c27b087c 100644 (file)
--- 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;
 };
 
 /*