diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-21 00:32:21 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-21 00:32:21 +0000 |
| commit | 75ea44466715c02cf6536b986e3e57e0ba778f29 (patch) | |
| tree | e47895f5178e3d50471cd62302f3868b1172cd68 /linux/drivers/media/video/bt8xx/bttv-cards.c | |
| parent | 29b2e515ecb5b3ea3f6bfce92caf5bcd632788af (diff) | |
| download | mediapointer-dvb-s2-75ea44466715c02cf6536b986e3e57e0ba778f29.tar.gz mediapointer-dvb-s2-75ea44466715c02cf6536b986e3e57e0ba778f29.tar.bz2 | |
bt8xx: unaligned access
From: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 6c8405ed0..ddc545f4d 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -35,6 +35,7 @@ #include <net/checksum.h> #include "compat.h" +#include <asm/unaligned.h> #include <asm/io.h> #include "bttvp.h" @@ -3947,7 +3948,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256]) ee += i; /* found a valid descriptor */ - type = be16_to_cpup((u16*)(ee+4)); + type = get_unaligned_be16((__be16 *)(ee+4)); switch(type) { /* 848 based */ @@ -4007,7 +4008,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256]) btv->c.nr, type); break; } - serial = be32_to_cpup((u32*)(ee+6)); + serial = get_unaligned_be32((__be32 *)(ee+6)); } printk(KERN_INFO "bttv%d: osprey eeprom: card=%d '%s' serial=%u\n", |