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

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
...@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state) ...@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state)
return err; 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; unsigned char expa;
int err = 0; int err = 0;
...@@ -306,7 +308,7 @@ static void set_trans_mode(void *data) ...@@ -306,7 +308,7 @@ static void set_trans_mode(void *data)
expa &= ~0x03; expa &= ~0x03;
if (*mode & IR_SIRMODE) { if (mode & IR_SIRMODE) {
expa |= 0x01; expa |= 0x01;
} else { /* MIR/FIR */ } else { /* MIR/FIR */
expa |= 0x03; expa |= 0x03;
...@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode) ...@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode)
{ {
struct omap_irda_config *irda_config = dev->platform_data; struct omap_irda_config *irda_config = dev->platform_data;
irda_config->mode = mode;
cancel_delayed_work(&irda_config->gpio_expa); cancel_delayed_work(&irda_config->gpio_expa);
PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode); PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
#error this is not permitted - mode is an argument variable
schedule_delayed_work(&irda_config->gpio_expa, 0); schedule_delayed_work(&irda_config->gpio_expa, 0);
return 0; return 0;
......
...@@ -31,6 +31,7 @@ struct omap_irda_config { ...@@ -31,6 +31,7 @@ struct omap_irda_config {
unsigned long src_start; unsigned long src_start;
int tx_trigger; int tx_trigger;
int rx_trigger; int rx_trigger;
int mode;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment