diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 18:00:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 18:00:22 -0800 |
| commit | d7fe321eeba58f0a37cc4324d10e52092be457e0 (patch) | |
| tree | d77116255f52e5b7b9484b4df41c55126cf06882 /drivers/mtd/ubi/build.c | |
| parent | 4a0d3f3afddf01dfcfdcc826f0b706dbc01f4ef4 (diff) | |
| parent | f7f0283776b6fe33f87f6a2ef15b1feb49ef6dac (diff) | |
| download | linux-d7fe321eeba58f0a37cc4324d10e52092be457e0.tar.bz2 | |
Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6
* 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: mtd/ubi/vtbl.c: fix memory leak
UBI: fix sparse errors in ubi.h
UBI: fix error message
UBI: silence warning
Diffstat (limited to 'drivers/mtd/ubi/build.c')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 6ac81e35355c..275960462970 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1000,8 +1000,8 @@ static int __init ubi_init(void) mutex_unlock(&ubi_devices_mutex); if (err < 0) { put_mtd_device(mtd); - printk(KERN_ERR "UBI error: cannot attach %s\n", - p->name); + printk(KERN_ERR "UBI error: cannot attach mtd%d\n", + mtd->index); goto out_detach; } } |