diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/arm/mach-integrator/impd1.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-integrator/impd1.c')
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a1b153d1626c..a4bafee77a06 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
| @@ -420,8 +420,7 @@ static int impd1_probe(struct lm_device *dev) | |||
| 420 | free_impd1: | 420 | free_impd1: |
| 421 | if (impd1 && impd1->base) | 421 | if (impd1 && impd1->base) |
| 422 | iounmap(impd1->base); | 422 | iounmap(impd1->base); |
| 423 | if (impd1) | 423 | kfree(impd1); |
| 424 | kfree(impd1); | ||
| 425 | release_lm: | 424 | release_lm: |
| 426 | release_mem_region(dev->resource.start, SZ_4K); | 425 | release_mem_region(dev->resource.start, SZ_4K); |
| 427 | return ret; | 426 | return ret; |