Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161269
b: refs/heads/master
c: cad065f
h: refs/heads/master
i:
  161267: af1b704
v: v3
  • Loading branch information
Richard Röjfors authored and Dmitry Torokhov committed Jul 26, 2009
1 parent 87219b9 commit 6cd97c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 141586bc57f6083f36c18d86e1cfa5916a1e7c05
refs/heads/master: cad065fd1e95003444e8528f801f52164cb78561
9 changes: 6 additions & 3 deletions trunk/drivers/input/touchscreen/tsc2007.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, 0, 0);
input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT, 0, 0);

pdata->init_platform_hw();
if (pdata->init_platform_hw)
pdata->init_platform_hw();

err = request_irq(ts->irq, tsc2007_irq, 0,
client->dev.driver->name, ts);
Expand All @@ -316,7 +317,8 @@ static int __devinit tsc2007_probe(struct i2c_client *client,

err_free_irq:
tsc2007_free_irq(ts);
pdata->exit_platform_hw();
if (pdata->exit_platform_hw)
pdata->exit_platform_hw();
err_free_mem:
input_free_device(input_dev);
kfree(ts);
Expand All @@ -330,7 +332,8 @@ static int __devexit tsc2007_remove(struct i2c_client *client)

tsc2007_free_irq(ts);

pdata->exit_platform_hw();
if (pdata->exit_platform_hw)
pdata->exit_platform_hw();

input_unregister_device(ts->input);
kfree(ts);
Expand Down

0 comments on commit 6cd97c2

Please sign in to comment.