From d7434921cf3ed24d5676fc935fbf4bbc564b048e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 21 May 2008 00:32:41 -0300
Subject: [PATCH] --- yaml --- r: 97751 b: refs/heads/master c:
 fa9c13a383ea60b5e0a89e9e180683411bc5552c h: refs/heads/master i:   97749:
 19f4dd80d6f72af120b09d521a3f6a98ae02afcc   97747:
 2628826bade882a625c5251c3c0ed6a1ff548e4a   97743:
 45373cba08f870e01248d705fa7ce58340952fe6 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/dvb/dvb-usb/m920x.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 818ebd79e1f6..599176345279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 581a7f1a2ddedbc27ad76f518b861ce1e60ff5ab
+refs/heads/master: fa9c13a383ea60b5e0a89e9e180683411bc5552c
diff --git a/trunk/drivers/media/dvb/dvb-usb/m920x.c b/trunk/drivers/media/dvb/dvb-usb/m920x.c
index a12e6f784fda..54626a0dbf68 100644
--- a/trunk/drivers/media/dvb/dvb-usb/m920x.c
+++ b/trunk/drivers/media/dvb/dvb-usb/m920x.c
@@ -16,6 +16,7 @@
 #include "qt1010.h"
 #include "tda1004x.h"
 #include "tda827x.h"
+#include <asm/unaligned.h>
 
 /* debug */
 static int dvb_usb_m920x_debug;
@@ -347,13 +348,13 @@ static int m920x_firmware_download(struct usb_device *udev, const struct firmwar
 
 	for (pass = 0; pass < 2; pass++) {
 		for (i = 0; i + (sizeof(u16) * 3) < fw->size;) {
-			value = le16_to_cpu(*(u16 *)(fw->data + i));
+			value = get_unaligned_le16(fw->data + i);
 			i += sizeof(u16);
 
-			index = le16_to_cpu(*(u16 *)(fw->data + i));
+			index = get_unaligned_le16(fw->data + i);
 			i += sizeof(u16);
 
-			size = le16_to_cpu(*(u16 *)(fw->data + i));
+			size = get_unaligned_le16(fw->data + i);
 			i += sizeof(u16);
 
 			if (pass == 1) {