diff options
| author | merge <null@invalid> | 2008-12-29 12:11:49 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-29 12:11:49 +0000 |
| commit | 4f0d7f43b8a9d35be25f520834bbb13f2dae10f3 (patch) | |
| tree | c75c07e7c55a1004996754651484514e7530d38e /drivers/input/touchscreen/s3c2410_ts.c | |
| parent | 39a497b0421174c3f23ef3dffb0675a4db3aa3a0 (diff) | |
MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci-
pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage:
From: Balaji Rao <balajirrao@openmoko.org>
This patch gets the Linux mci stack to use the voltage it negotiated before
with the uSD card on resume. Without this, it always reverts to and stays at
3.3V.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'drivers/input/touchscreen/s3c2410_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 4159adaec7c..bc9b410f670 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -435,7 +435,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev) /* create the filter chain set up for the 2 coordinates we produce */ ret = ts_filter_create_chain( - (struct ts_filter_api **)&info->filter_sequence, + pdev, (struct ts_filter_api **)&info->filter_sequence, (void *)&info->filter_config, ts.tsf, ARRAY_SIZE(ts.coords)); if (ret) dev_info(&pdev->dev, "%d filter(s) initialized\n", ret); @@ -484,7 +484,7 @@ bail5: bail4: disable_irq(IRQ_ADC); bail3: - ts_filter_destroy_chain(ts.tsf); + ts_filter_destroy_chain(pdev, ts.tsf); kfifo_free(ts.event_fifo); bail2: input_unregister_device(ts.dev); @@ -511,7 +511,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) input_unregister_device(ts.dev); iounmap(base_addr); - ts_filter_destroy_chain(ts.tsf); + ts_filter_destroy_chain(pdev, ts.tsf); kfifo_free(ts.event_fifo); |