diff options
author | Hennerich, Michael <Michael.Hennerich@analog.com> | 2007-02-05 19:41:35 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-07 18:49:57 -0500 |
commit | dde6d43d060bf0e0f38c66f76908e460db3bf0d8 (patch) | |
tree | c78e8c487e3e52abd728b1b4c0e1be36171532cf /drivers/net | |
parent | f100ae2ed04d17fb450fe6e3a3780342da60acd0 (diff) |
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/orinoco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 936c888e03e1..2a65bb93de26 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -2059,7 +2059,7 @@ static int determine_firmware(struct net_device *dev) | |||
2059 | int err; | 2059 | int err; |
2060 | struct comp_id nic_id, sta_id; | 2060 | struct comp_id nic_id, sta_id; |
2061 | unsigned int firmver; | 2061 | unsigned int firmver; |
2062 | char tmp[SYMBOL_MAX_VER_LEN+1]; | 2062 | char tmp[SYMBOL_MAX_VER_LEN+1] __attribute__((aligned(2))); |
2063 | 2063 | ||
2064 | /* Get the hardware version */ | 2064 | /* Get the hardware version */ |
2065 | err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_NICID, &nic_id); | 2065 | err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_NICID, &nic_id); |