diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/mtd/ubi/vmt.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/mtd/ubi/vmt.c')
| -rw-r--r-- | drivers/mtd/ubi/vmt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index a3ca2257e601..5be58d85c639 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c | |||
| @@ -376,7 +376,9 @@ out_sysfs: | |||
| 376 | get_device(&vol->dev); | 376 | get_device(&vol->dev); |
| 377 | volume_sysfs_close(vol); | 377 | volume_sysfs_close(vol); |
| 378 | out_gluebi: | 378 | out_gluebi: |
| 379 | ubi_destroy_gluebi(vol); | 379 | if (ubi_destroy_gluebi(vol)) |
| 380 | dbg_err("cannot destroy gluebi for volume %d:%d", | ||
| 381 | ubi->ubi_num, vol_id); | ||
| 380 | out_cdev: | 382 | out_cdev: |
| 381 | cdev_del(&vol->cdev); | 383 | cdev_del(&vol->cdev); |
| 382 | out_mapping: | 384 | out_mapping: |