Re: [PATCH 1/3] firmware: allow firmware files to be built into kernel image

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Alan Cox <alan@...>
Cc: Takashi Iwai <tiwai@...>, <linux-kernel@...>, <aoliva@...>, Abhay Salunke <Abhay_Salunke@...>, <kay.sievers@...>
Date: Friday, May 23, 2008 - 5:04 pm

On Fri, 2008-05-23 at 21:31 +0100, Alan Cox wrote:

Hm, ok. Do you see any better fix than this for cxusb.c ?

--- cxusb.c~	2008-04-13 13:38:13.000000000 +0100
+++ cxusb.c	2008-05-23 22:01:31.000000000 +0100
@@ -23,6 +23,8 @@
  *
  * see Documentation/dvb/README.dvb-usb for more information
  */
+#include <linux/vmalloc.h>
+
 #include "cxusb.h"
 
 #include "cx22702.h"
@@ -695,12 +697,26 @@ static int bluebird_patch_dvico_firmware
 
 		if (fw->data[idoff] == (USB_VID_DVICO & 0xff) &&
 		    fw->data[idoff + 1] == USB_VID_DVICO >> 8) {
-			fw->data[idoff + 2] =
+			struct firmware new_fw;
+			u8 *new_fw_data = vmalloc(fw->size);
+			int ret;
+
+			if (!new_fw_data)
+				return -ENOMEM;
+
+			memcpy(new_fw_data, fw->data, fw->size);
+			new_fw.size = fw->size;
+			new_fw.data = fw->data;
+
+			new_fw_data[idoff + 2] =
 				le16_to_cpu(udev->descriptor.idProduct) + 1;
-			fw->data[idoff + 3] =
+			new_fw_data[idoff + 3] =
 				le16_to_cpu(udev->descriptor.idProduct) >> 8;
 
-			return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
+			ret = usb_cypress_load_firmware(udev, &new_fw,
+							CYPRESS_FX2);
+			vfree(new_fw_data);
+			return ret;
 		}
 	}
 

-- 
dwmw2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: [PATCH 1/3] firmware: allow firmware files to be built i..., David Woodhouse, (Fri May 23, 5:04 pm)
Re: [PATCH 1/3] firmware: allow firmware files to be built i..., Lennart Sorensen, (Fri May 23, 12:38 pm)
[PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Fri May 23, 9:46 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sat May 24, 10:46 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sat May 24, 11:25 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sat May 24, 11:34 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sat May 24, 2:18 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 7:49 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Alexandre Oliva, (Sun May 25, 1:17 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:49 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Alexandre Oliva, (Sun May 25, 11:30 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Alexandre Oliva, (Sun May 25, 11:13 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Alexandre Oliva, (Mon May 26, 1:09 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 3:01 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 9:19 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:15 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:34 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:23 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:46 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 3:03 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sun May 25, 10:18 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 9:12 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:12 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:28 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 7:54 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sun May 25, 9:46 am)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sun May 25, 2:07 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Sat May 24, 3:23 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, Marcel Holtmann, (Sat May 24, 3:31 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Fri May 23, 2:07 pm)
Re: [PATCH 2/3] firmware: Add CONFIG_BUILTIN_FIRMWARE option, David Woodhouse, (Fri May 23, 1:13 pm)