X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=155d02697cb90400107b59922e1cb99f917f978e;hp=1c0b928158d04405c66321e4ed6cfeec1468ee23;hb=a713c13d1089170828403e98c57d3fba9aedf9a4;hpb=480d69f921a23cfe62e05692cd646b8fce50d262

diff --git a/alsa_write.c b/alsa_write.c
index 1c0b9281..155d0269 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -114,7 +114,6 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		&pad->sample_rate, NULL);
 	if (ret < 0)
 		goto fail;
-	msg = "unable to get buffer time";
 	/* alsa wants microseconds */
 	pad->buffer_time = conf->buffer_time_arg * 1000;
 	msg = "could not set buffer time";
@@ -203,7 +202,7 @@ fail:
 static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
 	struct pollfd pfd;
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_alsa_write_data *pad = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -252,7 +251,7 @@ static void alsa_close(struct writer_node *wn)
 static int alsa_write_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = task_context(t);
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	char *data;