summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-21 00:33:01 +0000
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-21 00:33:01 +0000
commit45c2f7f961e7e6bb92b03635989ceade61e15d98 (patch)
treeacd686461f970aa4e4dab67dc6284f7d0bca2785 /linux/drivers/media/dvb
parent58e667829a9fe602c54efee8f33a6be41ca6187f (diff)
downloadmediapointer-dvb-s2-45c2f7f961e7e6bb92b03635989ceade61e15d98.tar.gz
mediapointer-dvb-s2-45c2f7f961e7e6bb92b03635989ceade61e15d98.tar.bz2
usb: unaligned
From: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
index e1112e39f..733a7ff7b 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
@@ -127,7 +127,7 @@ int dvb_usb_get_hexline(const struct firmware *fw, struct hexline *hx,
if ((*pos + hx->len + 4) >= fw->size)
return -EINVAL;
- hx->addr = le16_to_cpu( *((u16 *) &b[1]) );
+ hx->addr = b[1] | (b[2] << 8);
hx->type = b[3];
if (hx->type == 0x04) {