diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /kernel/irq/devres.c | |
| parent | fb8f7ba077b5c665432082ab205bcd2cb01f6a3c (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/irq/devres.c')
| -rw-r--r-- | kernel/irq/devres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index 85a430da0fb6..d8ee241115f5 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c | |||
| @@ -54,7 +54,7 @@ int devm_request_irq(struct device *dev, unsigned int irq, | |||
| 54 | 54 | ||
| 55 | rc = request_irq(irq, handler, irqflags, devname, dev_id); | 55 | rc = request_irq(irq, handler, irqflags, devname, dev_id); |
| 56 | if (rc) { | 56 | if (rc) { |
| 57 | kfree(dr); | 57 | devres_free(dr); |
| 58 | return rc; | 58 | return rc; |
| 59 | } | 59 | } |
| 60 | 60 | ||