Skip to content

Commit

Permalink
ARM: OMAP: fix MMC workqueue changes
Browse files Browse the repository at this point in the history
fix OMAP MMC workqueue in recent workqueue change

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
  • Loading branch information
Kyungmin Park authored and Pierre Ossman committed Jan 4, 2007
1 parent 7523c4d commit 3947a39
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mmc/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,9 +581,9 @@ static void mmc_omap_switch_timer(unsigned long arg)
schedule_work(&host->switch_work);
}

static void mmc_omap_switch_handler(void *data)
static void mmc_omap_switch_handler(struct work_struct *work)
{
struct mmc_omap_host *host = (struct mmc_omap_host *) data;
struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, switch_work);
struct mmc_card *card;
static int complained = 0;
int cards = 0, cover_open;
Expand Down Expand Up @@ -1116,7 +1116,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host);

if (host->switch_pin >= 0) {
INIT_WORK(&host->switch_work, mmc_omap_switch_handler, host);
INIT_WORK(&host->switch_work, mmc_omap_switch_handler);
init_timer(&host->switch_timer);
host->switch_timer.function = mmc_omap_switch_timer;
host->switch_timer.data = (unsigned long) host;
Expand Down

0 comments on commit 3947a39

Please sign in to comment.