Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c582cc66 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f67d71ae

sound/firewire/oxfw/oxfw.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,7 @@ static void oxfw_card_free(struct snd_card *card) 
		kfree(oxfw->rx_stream_formats[i]);

		kfree(oxfw->rx_stream_formats[i]);

	}

	}





	kfree(oxfw->spec);

	mutex_destroy(&oxfw->mutex);

	mutex_destroy(&oxfw->mutex);

}

}

sound/firewire/oxfw/oxfw.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,7 @@ struct snd_oxfw { 
	wait_queue_head_t hwdep_wait;

	wait_queue_head_t hwdep_wait;





	const struct ieee1394_device_id *entry;

	const struct ieee1394_device_id *entry;

	void *spec;

};

};





/*

/*