diff options
author | 2008-07-03 16:24:06 -0400 | |
---|---|---|
committer | 2008-07-03 16:24:06 -0400 | |
commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | |
parent | nfsd: dprint operation names (diff) | |
parent | svcrdma: Change WR context get/put to use the kmem cache (diff) | |
download | linux-dev-e86322f611eef95aafaf726fd3965e5b211f1985.tar.xz linux-dev-e86322f611eef95aafaf726fd3965e5b211f1985.zip |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-firmware.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 2 |
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) { |