diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 16:13:55 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 16:13:55 -0400 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /drivers/input/misc/wm831x-on.c | |
| parent | 6795a524f0b049ceb5417d5036ab5e233345b900 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'drivers/input/misc/wm831x-on.c')
| -rw-r--r-- | drivers/input/misc/wm831x-on.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c index 47f18d6bce46..6790a812a1db 100644 --- a/drivers/input/misc/wm831x-on.c +++ b/drivers/input/misc/wm831x-on.c | |||
| @@ -73,7 +73,7 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev) | |||
| 73 | { | 73 | { |
| 74 | struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); | 74 | struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); |
| 75 | struct wm831x_on *wm831x_on; | 75 | struct wm831x_on *wm831x_on; |
| 76 | int irq = platform_get_irq(pdev, 0); | 76 | int irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0)); |
| 77 | int ret; | 77 | int ret; |
| 78 | 78 | ||
| 79 | wm831x_on = kzalloc(sizeof(struct wm831x_on), GFP_KERNEL); | 79 | wm831x_on = kzalloc(sizeof(struct wm831x_on), GFP_KERNEL); |