diff options
author | Takashi Sakamoto | 2018-10-03 01:21:53 +0200 |
---|---|---|
committer | Takashi Iwai | 2018-10-04 07:54:08 +0200 |
commit | 72bc8c4378f82307ff09f0959011fef2c818146d (patch) | |
tree | 0180c9dd0c405d634403229958031dfc34f0ec59 /sound/firewire/oxfw/oxfw-scs1x.c | |
parent | ALSA: fireworks: use managed-resource to maintain response buffer (diff) | |
download | kernel-qcow2-linux-72bc8c4378f82307ff09f0959011fef2c818146d.tar.gz kernel-qcow2-linux-72bc8c4378f82307ff09f0959011fef2c818146d.tar.xz kernel-qcow2-linux-72bc8c4378f82307ff09f0959011fef2c818146d.zip |
ALSA: oxfw: use managed-resource to maintain model-specific data
ALSA oxfw driver allocates memory objects for data specific to some
models. These objects are used to maintain functionalities specific
to the models for ALSA rawMIDI/control interfaces. They can be
released as managed-resource of 'struct snd_card.card_dev'.
This commit uses managed-resource of the sound card device for this
purpose.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw-scs1x.c')
-rw-r--r-- | sound/firewire/oxfw/oxfw-scs1x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw-scs1x.c b/sound/firewire/oxfw/oxfw-scs1x.c index f33497cdc706..9d9545880a28 100644 --- a/sound/firewire/oxfw/oxfw-scs1x.c +++ b/sound/firewire/oxfw/oxfw-scs1x.c @@ -372,8 +372,9 @@ int snd_oxfw_scs1x_add(struct snd_oxfw *oxfw) struct fw_scs1x *scs; int err; - scs = kzalloc(sizeof(struct fw_scs1x), GFP_KERNEL); - if (scs == NULL) + scs = devm_kzalloc(&oxfw->card->card_dev, sizeof(struct fw_scs1x), + GFP_KERNEL); + if (!scs) return -ENOMEM; scs->fw_dev = fw_parent_device(oxfw->unit); oxfw->spec = scs; |