projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
media
/
media-device.c
diff --git
a/drivers/media/media-device.c
b/drivers/media/media-device.c
index
88b97c9
..
73a4329
100644
(file)
--- a/
drivers/media/media-device.c
+++ b/
drivers/media/media-device.c
@@
-106,8
+106,6
@@
static long media_device_enum_entities(struct media_device *mdev,
if (ent->name) {
strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
u_ent.name[sizeof(u_ent.name) - 1] = '\0';
- } else {
- memset(u_ent.name, 0, sizeof(u_ent.name));
}
u_ent.type = ent->type;
u_ent.revision = ent->revision;