Commit dde6d43d authored by Hennerich, Michael's avatar Hennerich, Michael Committed by Jeff Garzik

fix unaligned exception in /drivers/net/wireless/orinoco.c

Prevent an unaligned exception to occur.  (GCC 4.1) tmp is defined as char
pointer while it is later accessed as short.

Cc: Jean Tourrilhes <jt@hpl.hp.com>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f100ae2e
...@@ -2059,7 +2059,7 @@ static int determine_firmware(struct net_device *dev) ...@@ -2059,7 +2059,7 @@ static int determine_firmware(struct net_device *dev)
int err; int err;
struct comp_id nic_id, sta_id; struct comp_id nic_id, sta_id;
unsigned int firmver; unsigned int firmver;
char tmp[SYMBOL_MAX_VER_LEN+1]; char tmp[SYMBOL_MAX_VER_LEN+1] __attribute__((aligned(2)));
/* Get the hardware version */ /* Get the hardware version */
err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_NICID, &nic_id); err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_NICID, &nic_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment