Skip to content

Commit

Permalink
ARM: OMAP: H3 workqueue fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Dirk Behme authored and Tony Lindgren committed Aug 22, 2007
1 parent eebdf7d commit 666cd17
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
12 changes: 7 additions & 5 deletions arch/arm/mach-omap1/board-h3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions include/asm-arm/arch-omap/irda.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct omap_irda_config {
unsigned long src_start;
int tx_trigger;
int rx_trigger;
int mode;
};

#endif

0 comments on commit 666cd17

Please sign in to comment.