ALSA: oxfw: enable to keep memory block for model-specific structure

takaswie · tiwai · commit c582cc66b98a · 2015-12-22T11:50:29.000+01:00
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 &lt;o-takashi@sakamocchi.jp&gt;
Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git 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
@@ -74,6 +74,7 @@ struct snd_oxfw {
 	wait_queue_head_t hwdep_wait;
 
 	const struct ieee1394_device_id *entry;
+	void *spec;
 };
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ static void oxfw_card_free(struct snd_card *card)`
`132`	`132`	`kfree(oxfw->rx_stream_formats[i]);`
`133`	`133`	`}`
`134`	`134`
	`135`	`+ kfree(oxfw->spec);`
`135`	`136`	`mutex_destroy(&oxfw->mutex);`
`136`	`137`	`}`
`137`	`138`