From 3c2666c374677a051ca3682b0d683eae88f6246d Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 29 Oct 2008 08:58:39 +0530 Subject: [PATCH] --- yaml --- r: 126635 b: refs/heads/master c: bf437012503cc99519e20b4a8bddf830cdaae794 h: refs/heads/master i: 126633: 14b04f06e9e4ddb58fdcc9a785b5834546964940 126631: 2fac7db8a6b9ea623b881160475c22bea5a7e9c0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/poch/poch.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 3ca9d9dc191e..d2d505bf672d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca219995b299a069dc0a88ddc24ac72423a81361 +refs/heads/master: bf437012503cc99519e20b4a8bddf830cdaae794 diff --git a/trunk/drivers/staging/poch/poch.c b/trunk/drivers/staging/poch/poch.c index 0a3eca14075e..3ecbd7c43c48 100644 --- a/trunk/drivers/staging/poch/poch.c +++ b/trunk/drivers/staging/poch/poch.c @@ -948,14 +948,7 @@ static int poch_channel_available(struct channel_info *channel) spin_lock_irq(&channel->group_offsets_lock); for (i = 0; i < channel->group_count; i++) { - if (channel->dir == CHANNEL_DIR_RX - && channel->header->group_offsets[i] == -1) { - spin_unlock_irq(&channel->group_offsets_lock); - return 1; - } - - if (channel->dir == CHANNEL_DIR_TX - && channel->header->group_offsets[i] != -1) { + if (channel->header->group_offsets[i] != -1) { spin_unlock_irq(&channel->group_offsets_lock); return 1; } @@ -1103,10 +1096,7 @@ static void poch_irq_dma(struct channel_info *channel) for (i = 0; i < groups_done; i++) { j = (prev_transfer + i) % channel->group_count; - if (channel->dir == CHANNEL_DIR_RX) - group_offsets[j] = -1; - else - group_offsets[j] = groups[j].user_offset; + group_offsets[j] = groups[j].user_offset; } spin_unlock(&channel->group_offsets_lock);