diff --git a/[refs] b/[refs] index a9c3b9cab8c8..1d87c4ce3974 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a954b6681dd389e6bb63d9b5f3254d675f6984c9 +refs/heads/master: 637007fe5cfc790c46e3d7af8ba069ddd73f389c diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c index e1112e39fb63..733a7ff7b207 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c +++ b/trunk/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) {