The mrst_max3110.c driver uses an open coded, non atomic variable
to create exclusion between two of its worker threads. More than that,
while the main thread does a proper set-work-clear sequence,
the other thread only does a test, with the result that no actual
exclusion is happening.
this patch replaces this open coded variable with a proper mutex
in addition, the 'lock' spinlock is removed from the per adapter structure,
the lock was only ever initialized but never used
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
wait_queue_head_t wq;
struct task_struct *main_thread;
struct task_struct *read_thread;
wait_queue_head_t wq;
struct task_struct *main_thread;
struct task_struct *read_thread;
- int mthread_up;
- spinlock_t lock;
+ struct mutex thread_mutex;;
atomic_read(&max->con_tx_need) ||
atomic_read(&max->uart_tx_need)) ||
kthread_should_stop());
atomic_read(&max->con_tx_need) ||
atomic_read(&max->uart_tx_need)) ||
kthread_should_stop());
+
+ mutex_lock(&max->thread_mutex);
#ifdef CONFIG_MRST_MAX3110_IRQ
if (atomic_read(&max->irq_pending)) {
#ifdef CONFIG_MRST_MAX3110_IRQ
if (atomic_read(&max->irq_pending)) {
transmit_char(max);
atomic_set(&max->uart_tx_need, 0);
}
transmit_char(max);
atomic_set(&max->uart_tx_need, 0);
}
+ mutex_unlock(&max->thread_mutex);
} while (!kthread_should_stop());
return ret;
} while (!kthread_should_stop());
return ret;
pr_info(PR_FMT "start read thread\n");
do {
pr_info(PR_FMT "start read thread\n");
do {
- if (!max->mthread_up)
- max3110_console_receive(max);
+ mutex_lock(&max->thread_mutex);
+ max3110_console_receive(max);
+ mutex_unlock(&max->thread_mutex);
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ / 20);
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ / 20);
max->name = spi->modalias; /* use spi name as the name */
max->irq = (u16)spi->irq;
max->name = spi->modalias; /* use spi name as the name */
max->irq = (u16)spi->irq;
- spin_lock_init(&max->lock);
+ mutex_init(&max->thread_mutex);
max->word_7bits = 0;
max->parity = 0;
max->word_7bits = 0;
max->parity = 0;