diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 15:57:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 15:57:50 -0500 |
| commit | 551e28dbe82f9de58993d7587201a2569b942341 (patch) | |
| tree | 8f14618a4f5f016d41eb5b263784e3e2a4dd2bf3 /drivers/mtd | |
| parent | b39bda6e7329b1be6dfc2741ed298b6e814532a5 (diff) | |
| parent | c5ce5b46af76f52dea21f467397d24c4ae6cb3ff (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6:
UBI: fix volume creation input checking
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/ubi/cdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index f237ddbb2713..111ea41c4ecd 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c | |||
| @@ -853,7 +853,6 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd, | |||
| 853 | break; | 853 | break; |
| 854 | } | 854 | } |
| 855 | 855 | ||
| 856 | req.name[req.name_len] = '\0'; | ||
| 857 | err = verify_mkvol_req(ubi, &req); | 856 | err = verify_mkvol_req(ubi, &req); |
| 858 | if (err) | 857 | if (err) |
| 859 | break; | 858 | break; |