The patch number 9146 was added via Antti Palosaari <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Antti Palosaari <[EMAIL PROTECTED]>
af901x: fix some compiler errors and warnings
- cast firmware data to u8
- remove cpu_to_le16 from switch-case label
Priority: normal
Signed-off-by: Antti Palosaari <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/dvb-usb/af9015.c | 12 ++++++------
linux/drivers/media/dvb/frontends/af9013.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff -r e9329da68ceb -r 7a8fd6996fc7 linux/drivers/media/dvb/dvb-usb/af9015.c
--- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Sep 26 17:40:53 2008 +0300
+++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Mon Oct 06 19:57:45 2008 +0300
@@ -661,7 +661,7 @@ static int af9015_download_firmware(stru
len = remainder;
req.data_len = len;
- req.data = (fw->data + i * FW_PACKET_MAX_DATA);
+ req.data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
req.addr = addr;
addr += FW_PACKET_MAX_DATA;
@@ -742,7 +742,7 @@ static int af9015_read_config(struct usb
}
} else {
switch (udev->descriptor.idVendor) {
- case cpu_to_le16(USB_VID_LEADTEK):
+ case USB_VID_LEADTEK:
af9015_properties[i].rc_key_map =
af9015_rc_keys_leadtek;
af9015_properties[i].rc_key_map_size =
@@ -752,9 +752,9 @@ static int af9015_read_config(struct usb
af9015_config.ir_table_size =
ARRAY_SIZE(af9015_ir_table_leadtek);
break;
- case cpu_to_le16(USB_VID_VISIONPLUS):
+ case USB_VID_VISIONPLUS:
if (udev->descriptor.idProduct ==
- cpu_to_le16(USB_PID_AZUREWAVE_AD_TU700)) {
+ USB_PID_AZUREWAVE_AD_TU700) {
af9015_properties[i].rc_key_map =
af9015_rc_keys_twinhan;
af9015_properties[i].rc_key_map_size =
@@ -765,7 +765,7 @@ static int af9015_read_config(struct usb
ARRAY_SIZE(af9015_ir_table_twinhan);
}
break;
- case cpu_to_le16(USB_VID_KWORLD_2):
+ case USB_VID_KWORLD_2:
/* TODO: use correct rc keys */
af9015_properties[i].rc_key_map =
af9015_rc_keys_twinhan;
@@ -778,7 +778,7 @@ static int af9015_read_config(struct usb
/* Check USB manufacturer and product strings and try
to determine correct remote in case of chip vendor
reference IDs are used. */
- case cpu_to_le16(USB_VID_AFATECH):
+ case USB_VID_AFATECH:
memset(manufacturer, 0, sizeof(manufacturer));
usb_string(udev, udev->descriptor.iManufacturer,
manufacturer, sizeof(manufacturer));
diff -r e9329da68ceb -r 7a8fd6996fc7 linux/drivers/media/dvb/frontends/af9013.c
--- a/linux/drivers/media/dvb/frontends/af9013.c Fri Sep 26 17:40:53
2008 +0300
+++ b/linux/drivers/media/dvb/frontends/af9013.c Mon Oct 06 19:57:45
2008 +0300
@@ -1490,7 +1490,7 @@ static int af9013_download_firmware(stru
if (i == packets) /* set size of the last packet */
len = remainder;
- data = (fw->data + i * FW_PACKET_MAX_DATA);
+ data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
ret = af9013_write_ofsm_regs(state, addr, data, len);
addr += FW_PACKET_MAX_DATA;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/7a8fd6996fc764efecaa40b189cdd1ccd1de2f8c
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
