diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 08:36:12 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 08:36:12 +0200 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /drivers/char/applicom.c | |
| parent | Input: document INPUT_PROP_TOPBUTTONPAD (diff) | |
| parent | Merge branch 'wacom' into next (diff) | |
| download | linux-5e2aa2ed08e2e280121dc7cf5609c87d464f12ef.tar.xz linux-5e2aa2ed08e2e280121dc7cf5609c87d464f12ef.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'drivers/char/applicom.c')
| -rw-r--r-- | drivers/char/applicom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index 974321a2508d..14790304b84b 100644 --- a/drivers/char/applicom.c +++ b/drivers/char/applicom.c @@ -345,7 +345,6 @@ out: free_irq(apbs[i].irq, &dummy); iounmap(apbs[i].RamIO); } - pci_disable_device(dev); return ret; } |