diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /drivers/media/media-device.c | |
parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r-- | drivers/media/media-device.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 79715f9feb0a..fdb5840f034b 100644 --- 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; |