lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP: fix MMC workqueue changes

Browse Source 
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>
This commit is contained in:
Kyungmin Park
2007-01-04 07:03:16 +01:00
committed by Pierre Ossman
parent 7523c4dd99
commit 3947a3907f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/omap.c
View File

@@ -581,9 +581,9 @@ static void mmc_omap_switch_timer(unsigned long arg)
schedule_work(&host->switch_work); 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; struct mmc_card *card;
static int complained = 0; static int complained = 0;
int cards = 0, cover_open; int cards = 0, cover_open;
@@ -1116,7 +1116,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
if (host->switch_pin >= 0) { 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); init_timer(&host->switch_timer);
host->switch_timer.function = mmc_omap_switch_timer; host->switch_timer.function = mmc_omap_switch_timer;
host->switch_timer.data = (unsigned long) host; host->switch_timer.data = (unsigned long) host;