summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-05-21 07:33:01 +0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-05 13:35:53 +0400
commit637007fe5cfc790c46e3d7af8ba069ddd73f389c (patch)
tree678794efa77fdad845986c7b4565e1efe591237d /drivers/media/dvb/dvb-usb
parenta954b6681dd389e6bb63d9b5f3254d675f6984c9 (diff)
downloadlinux-637007fe5cfc790c46e3d7af8ba069ddd73f389c.tar.xz
V4L/DVB (7971): usb: unaligned
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-firmware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
index e1112e39fb63..733a7ff7b207 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
+++ b/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) {