ALSA: seq: Fix assignment in if condition

[linux-2.6-microblaze.git] / sound / core / seq / seq_queue.c

diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 13cfc2d..d6c02de 100644 (file)
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -222,7 +222,8 @@ struct snd_seq_queue *snd_seq_queue_find_name(char *name)
        struct snd_seq_queue *q;
 
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) != NULL) {
+               q = queueptr(i);
+               if (q) {
                        if (strncmp(q->name, name, sizeof(q->name)) == 0)
                                return q;
                        queuefree(q);
@@ -432,7 +433,8 @@ int snd_seq_queue_timer_open(int queueid)
        if (queue == NULL)
                return -EINVAL;
        tmr = queue->timer;
-       if ((result = snd_seq_timer_open(queue)) < 0) {
+       result = snd_seq_timer_open(queue);
+       if (result < 0) {
                snd_seq_timer_defaults(tmr);
                result = snd_seq_timer_open(queue);
        }
@@ -548,7 +550,8 @@ void snd_seq_queue_client_leave(int client)
 
        /* delete own queues from queue list */
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queue_list_remove(i, client)) != NULL)
+               q = queue_list_remove(i, client);
+               if (q)
                        queue_delete(q);
        }
 
@@ -556,7 +559,8 @@ void snd_seq_queue_client_leave(int client)
         * they are not owned by this client
         */
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) == NULL)
+               q = queueptr(i);
+               if (!q)
                        continue;
                if (test_bit(client, q->clients_bitmap)) {
                        snd_seq_prioq_leave(q->tickq, client, 0);
@@ -578,7 +582,8 @@ void snd_seq_queue_client_leave_cells(int client)
        struct snd_seq_queue *q;
 
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) == NULL)
+               q = queueptr(i);
+               if (!q)
                        continue;
                snd_seq_prioq_leave(q->tickq, client, 0);
                snd_seq_prioq_leave(q->timeq, client, 0);
@@ -593,7 +598,8 @@ void snd_seq_queue_remove_cells(int client, struct snd_seq_remove_events *info)
        struct snd_seq_queue *q;
 
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) == NULL)
+               q = queueptr(i);
+               if (!q)
                        continue;
                if (test_bit(client, q->clients_bitmap) &&
                    (! (info->remove_mode & SNDRV_SEQ_REMOVE_DEST) ||
@@ -724,7 +730,8 @@ void snd_seq_info_queues_read(struct snd_info_entry *entry,
        int owner;
 
        for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) == NULL)
+               q = queueptr(i);
+               if (!q)
                        continue;
 
                tmr = q->timer;