Commit 666cd174 authored by Dirk Behme's avatar Dirk Behme Committed by Tony Lindgren
Browse files

ARM: OMAP: H3 workqueue fixes 



Signed-off-by: default avatarDirk Behme <dirk.behme@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent eebdf7d7

arch/arm/mach-omap1/board-h3.c

+7 −5
Original line number Diff line number Diff line
@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state) 
	return err;

}



static void set_trans_mode(void *data)

static void set_trans_mode(struct work_struct *work)

{

	int *mode = data;

	struct omap_irda_config *irda_config =

		container_of(work, struct omap_irda_config, gpio_expa.work);

	int mode = irda_config->mode;

	unsigned char expa;

	int err = 0;
@@ -306,7 +308,7 @@ static void set_trans_mode(void *data) 


	expa &= ~0x03;



	if (*mode & IR_SIRMODE) {

	if (mode & IR_SIRMODE) {

		expa |= 0x01;

	} else { /* MIR/FIR */

		expa |= 0x03;
@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode) 
{

	struct omap_irda_config *irda_config = dev->platform_data;



	irda_config->mode = mode;

	cancel_delayed_work(&irda_config->gpio_expa);

	PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);

#error this is not permitted - mode is an argument variable

	PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);

	schedule_delayed_work(&irda_config->gpio_expa, 0);



	return 0;

include/asm-arm/arch-omap/irda.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct omap_irda_config { 
	unsigned long src_start;

	int tx_trigger;

	int rx_trigger;

	int mode;

};



#endif