commit 637007fe5cfc790c46e3d7af8ba069ddd73f389c
author Al Viro <viro@ftp.linux.org.uk> Wed May 21 00:33:01 2008 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Thu Jun 05 06:35:53 2008 -0300
tree 678794efa77fdad845986c7b4565e1efe591237d
parent a954b6681dd389e6bb63d9b5f3254d675f6984c9

V4L/DVB (7971): usb: unaligned

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/dvb/dvb-usb/dvb-usb-firmware.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
index e1112e3..733a7ff 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 @@
 	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) {