From 56a6d0f924959d4a6f6dc3e9d011fa4f1cc92c5d Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 31 Dec 2009 16:47:59 +0100
Subject: [PATCH] --- yaml --- r: 185307 b: refs/heads/master c:
 5be796f0b842c5852d7397a82f8ebd6be8451872 h: refs/heads/master i:   185305:
 562071f62deb3d5692ce4f2b5e96a947b7539698   185303:
 5cb7941b9a0ac6ee57a9f6f865431020fe0329ce v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/serial/ch341.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85d34b4d98de..50676fe7b00b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0ef90b49857b403c1cfa62fce229c967dd4be40
+refs/heads/master: 5be796f0b842c5852d7397a82f8ebd6be8451872
diff --git a/trunk/drivers/usb/serial/ch341.c b/trunk/drivers/usb/serial/ch341.c
index 4fd01d6b7157..6230d24894ff 100644
--- a/trunk/drivers/usb/serial/ch341.c
+++ b/trunk/drivers/usb/serial/ch341.c
@@ -22,6 +22,7 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/serial.h>
+#include <asm/unaligned.h>
 
 #define DEFAULT_BAUD_RATE 9600
 #define DEFAULT_TIMEOUT   1000
@@ -422,7 +423,7 @@ static void ch341_break_ctl(struct tty_struct *tty, int break_state)
 	}
 	dbg("%s - New ch341 break register contents - reg1: %x, reg2: %x",
 			__func__, break_reg[0], break_reg[1]);
-	reg_contents = le16_to_cpup((uint16_t *)break_reg);
+	reg_contents = get_unaligned_le16(break_reg);
 	r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG,
 			ch341_break_reg, reg_contents);
 	if (r < 0)