From bf437012503cc99519e20b4a8bddf830cdaae794 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 29 Oct 2008 08:58:39 +0530 Subject: Staging: poch: Fix user space protocol syncing Always set the user space offset from kernel space, to indicate group transmitted/received. Signed-off-by: Vijay Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/poch/poch.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'drivers/staging/poch') diff --git a/drivers/staging/poch/poch.c b/drivers/staging/poch/poch.c index 0a3eca1..3ecbd7c 100644 --- a/drivers/staging/poch/poch.c +++ b/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); -- cgit v1.1