diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /drivers/mtd/ubi/cdev.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/mtd/ubi/cdev.c')
| -rw-r--r-- | drivers/mtd/ubi/cdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index b30a0b83d7f1..98cf31ed0814 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c | |||
| @@ -721,7 +721,8 @@ static int rename_volumes(struct ubi_device *ubi, | |||
| 721 | * It seems we need to remove volume with name @re->new_name, | 721 | * It seems we need to remove volume with name @re->new_name, |
| 722 | * if it exists. | 722 | * if it exists. |
| 723 | */ | 723 | */ |
| 724 | desc = ubi_open_volume_nm(ubi->ubi_num, re->new_name, UBI_EXCLUSIVE); | 724 | desc = ubi_open_volume_nm(ubi->ubi_num, re->new_name, |
| 725 | UBI_EXCLUSIVE); | ||
| 725 | if (IS_ERR(desc)) { | 726 | if (IS_ERR(desc)) { |
| 726 | err = PTR_ERR(desc); | 727 | err = PTR_ERR(desc); |
| 727 | if (err == -ENODEV) | 728 | if (err == -ENODEV) |