diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-27 11:38:08 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 11:38:08 -0400 |
| commit | a58bdba749b36069ec372da9c9fd16017b6c0b47 (patch) | |
| tree | 95c79448427425d1c05712a7c7fb98ed42e41539 /drivers/media/media-device.c | |
| parent | 00a6d7b6762c27d441e9ac8faff36384bc0fc180 (diff) | |
| parent | 51fa31d462f32e1ffdf957802dcab1dc20d2f243 (diff) | |
Merge branch 'topic/firewire' into for-next
This is a merge of big firewire audio stack updates by Takashi Sakamoto.
Diffstat (limited to 'drivers/media/media-device.c')
| -rw-r--r-- | drivers/media/media-device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index d5a7a135f75d..703560fa5e73 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c | |||
| @@ -93,6 +93,7 @@ static long media_device_enum_entities(struct media_device *mdev, | |||
| 93 | struct media_entity *ent; | 93 | struct media_entity *ent; |
| 94 | struct media_entity_desc u_ent; | 94 | struct media_entity_desc u_ent; |
| 95 | 95 | ||
| 96 | memset(&u_ent, 0, sizeof(u_ent)); | ||
| 96 | if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id))) | 97 | if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id))) |
| 97 | return -EFAULT; | 98 | return -EFAULT; |
| 98 | 99 | ||