From 397f27ec6a6ceb4dd80c8044767eade625ca41d3 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Fri, 25 Jan 2013 19:23:30 -0300 Subject: [PATCH] --- yaml --- r: 357492 b: refs/heads/master c: 42f9de6eab3892d7da544be1cc882530eab5b203 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/go7007/go7007-driver.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f86d90bae3ae..a8857bde5545 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a147c3bf75d429fc7922abb582c7c686b028bc4 +refs/heads/master: 42f9de6eab3892d7da544be1cc882530eab5b203 diff --git a/trunk/drivers/staging/media/go7007/go7007-driver.c b/trunk/drivers/staging/media/go7007/go7007-driver.c index 0aaeb0aeb99e..66950916df23 100644 --- a/trunk/drivers/staging/media/go7007/go7007-driver.c +++ b/trunk/drivers/staging/media/go7007/go7007-driver.c @@ -108,14 +108,13 @@ static int go7007_load_encoder(struct go7007 *go) return -1; } fw_len = fw_entry->size - 16; - bounce = kmalloc(fw_len, GFP_KERNEL); + bounce = kmemdup(fw_entry->data + 16, fw_len, GFP_KERNEL); if (bounce == NULL) { v4l2_err(go, "unable to allocate %d bytes for " "firmware transfer\n", fw_len); release_firmware(fw_entry); return -1; } - memcpy(bounce, fw_entry->data + 16, fw_len); release_firmware(fw_entry); if (go7007_interface_reset(go) < 0 || go7007_send_firmware(go, bounce, fw_len) < 0 ||