diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-22 20:35:06 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-22 20:35:06 -0400 |
| commit | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (patch) | |
| tree | 7741cfd476f9c622a10c198da421fdb3e38708b9 /drivers/md/linear.c | |
| parent | ac67055ef2378ea95c34b593ddf9d0a0737a240a (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index b1941b887f46..8d740013d74d 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
| @@ -217,8 +217,7 @@ static int linear_run (mddev_t *mddev) | |||
| 217 | return 0; | 217 | return 0; |
| 218 | 218 | ||
| 219 | out: | 219 | out: |
| 220 | if (conf) | 220 | kfree(conf); |
| 221 | kfree(conf); | ||
| 222 | return 1; | 221 | return 1; |
| 223 | } | 222 | } |
| 224 | 223 | ||