diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:20:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:20:33 +0100 |
| commit | 471dd6b43f72f8ee00d3d1a1281d5aed9d4991ca (patch) | |
| tree | c431b236425ba493a374f33af9e683d091baf035 /drivers/char | |
| parent | 91521ab3c9a37895de12751f1e92af4cbdd57531 (diff) | |
| parent | d01bd6fdb3be2f6cec1d5918e20175adca97615b (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/char')
| -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; } |