summaryrefslogtreecommitdiff
path: root/sound/core/timer.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2025-09-05 17:09:18 +0100
committerMark Brown <broonie@kernel.org>2025-09-05 17:09:18 +0100
commit92b9c2b7a88c07324d70ea877cfe2d90ac823dbf (patch)
treec5c6df6a87eb3df891ce33191b80fe3aefac5add /sound/core/timer.c
parent9d35d068fb138160709e04e3ee97fe29a6f8615b (diff)
parentb497e1a1a2b10c4ddb28064fba229365ae03311a (diff)
regulator: pf530x: NXP PF530x regulator driver
Merge series from Woodrow Douglass <wdouglass@carnegierobotics.com>: I wrote this driver to read settings and state from the nxp pf530x regulator. Please consider it for inclusion, any criticism is welcome.
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r--sound/core/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 3ce12264eed8..d9fff5c87613 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -2139,14 +2139,14 @@ static int snd_utimer_create(struct snd_timer_uinfo *utimer_info,
goto err_take_id;
}
+ utimer->id = utimer_id;
+
utimer->name = kasprintf(GFP_KERNEL, "snd-utimer%d", utimer_id);
if (!utimer->name) {
err = -ENOMEM;
goto err_get_name;
}
- utimer->id = utimer_id;
-
tid.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION;
tid.dev_class = SNDRV_TIMER_CLASS_GLOBAL;
tid.card = -1;