diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 14:23:04 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 14:25:34 +0200 |
| commit | 46479e698530b8197d601a23317b7c7654195338 (patch) | |
| tree | 710b2758ecd7d8a6ada37724c5d4c8027d5f358f /drivers/mfd/tps65910-irq.c | |
| parent | 7b99b659d90c5d421cb1867295c78a4c0c030734 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
| download | talos-op-linux-46479e698530b8197d601a23317b7c7654195338.tar.gz talos-op-linux-46479e698530b8197d601a23317b7c7654195338.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git
Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/mfd/tps65910-irq.c')
| -rw-r--r-- | drivers/mfd/tps65910-irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/tps65910-irq.c b/drivers/mfd/tps65910-irq.c index a56be931551c..95c0d7978bec 100644 --- a/drivers/mfd/tps65910-irq.c +++ b/drivers/mfd/tps65910-irq.c @@ -215,6 +215,7 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq, int tps65910_irq_exit(struct tps65910 *tps65910) { - free_irq(tps65910->chip_irq, tps65910); + if (tps65910->chip_irq) + free_irq(tps65910->chip_irq, tps65910); return 0; } |
