|
@@ -35,28 +35,33 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
|
|
|
|
|
|
int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
|
|
|
{
|
|
|
- struct hexline hx;
|
|
|
+ struct hexline *hx;
|
|
|
u8 reset;
|
|
|
int ret,pos=0;
|
|
|
|
|
|
+ hx = kmalloc(sizeof(*hx), GFP_KERNEL);
|
|
|
+ if (!hx)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
/* stop the CPU */
|
|
|
reset = 1;
|
|
|
if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
|
|
|
err("could not stop the USB controller CPU.");
|
|
|
|
|
|
- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
|
|
|
- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
|
|
|
- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
|
|
|
+ while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) {
|
|
|
+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n", hx->addr, hx->len, hx->chk);
|
|
|
+ ret = usb_cypress_writemem(udev, hx->addr, hx->data, hx->len);
|
|
|
|
|
|
- if (ret != hx.len) {
|
|
|
+ if (ret != hx->len) {
|
|
|
err("error while transferring firmware (transferred size: %d, block size: %d)",
|
|
|
- ret,hx.len);
|
|
|
+ ret, hx->len);
|
|
|
ret = -EINVAL;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
if (ret < 0) {
|
|
|
err("firmware download failed at %d with %d",pos,ret);
|
|
|
+ kfree(hx);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -70,6 +75,8 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw
|
|
|
} else
|
|
|
ret = -EIO;
|
|
|
|
|
|
+ kfree(hx);
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
EXPORT_SYMBOL(usb_cypress_load_firmware);
|