From 7f816a9ec3451d48505d8741bad184b2b1cfd715 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 31 Dec 2009 16:48:01 +0100 Subject: [PATCH] --- yaml --- r: 185308 b: refs/heads/master c: 0f2c2d7bbb51338fdcda9670795a6c6e348622d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/cypress_m8.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 50676fe7b00b..ff1616d7bb92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5be796f0b842c5852d7397a82f8ebd6be8451872 +refs/heads/master: 0f2c2d7bbb51338fdcda9670795a6c6e348622d9 diff --git a/trunk/drivers/usb/serial/cypress_m8.c b/trunk/drivers/usb/serial/cypress_m8.c index 2457165304cb..b19e16a539e2 100644 --- a/trunk/drivers/usb/serial/cypress_m8.c +++ b/trunk/drivers/usb/serial/cypress_m8.c @@ -66,6 +66,7 @@ #include #include #include +#include #include "cypress_m8.h" @@ -376,7 +377,7 @@ static int cypress_serial_control(struct tty_struct *tty, __func__, new_baudrate); /* fill the feature_buffer with new configuration */ - *((u32 *)feature_buffer) = cpu_to_le32(new_baudrate); + put_unaligned_le32(new_baudrate, feature_buffer); feature_buffer[4] |= data_bits; /* assign data bits in 2 bit space ( max 3 ) */ /* 1 bit gap */ feature_buffer[4] |= (stop_bits << 3); /* assign stop bits in 1 bit space */ @@ -453,7 +454,7 @@ static int cypress_serial_control(struct tty_struct *tty, /* store the config in one byte, and later use bit masks to check values */ priv->current_config = feature_buffer[4]; - priv->baud_rate = le32_to_cpup((u32 *)feature_buffer); + priv->baud_rate = get_unaligned_le32(feature_buffer); spin_unlock_irqrestore(&priv->lock, flags); } }