From fc593f7ffea16774f513fdf7d51acad2e3e58c31 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Mon, 28 Dec 2009 23:01:47 +0100 Subject: [PATCH] --- yaml --- r: 185295 b: refs/heads/master c: 52372ccb5a19d35b68b79118fafdced0c12f0ec9 h: refs/heads/master i: 185293: 4e4a4274b8e0e615678da96ce6013983da482774 185291: be66c1de77c79e5939abc85368ca2caf36f65206 185287: 3e7a1c6dce1ccb6f5e927f2608dfcdceb12d4c42 185279: 40ad4ac408536081e8545e5ee6c9d8be4a4f572e v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ch341.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 057401ce1f02..aeb30028226b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2b5cc834b69d2999b749144481de9a94f01bc48 +refs/heads/master: 52372ccb5a19d35b68b79118fafdced0c12f0ec9 diff --git a/trunk/drivers/usb/serial/ch341.c b/trunk/drivers/usb/serial/ch341.c index 2942c6d381d0..4fd01d6b7157 100644 --- a/trunk/drivers/usb/serial/ch341.c +++ b/trunk/drivers/usb/serial/ch341.c @@ -422,7 +422,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 = (uint16_t)break_reg[0] | ((uint16_t)break_reg[1] << 8); + reg_contents = le16_to_cpup((uint16_t *)break_reg); r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG, ch341_break_reg, reg_contents); if (r < 0)