diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:51:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:51:08 -0300 |
| commit | b0c4835ca205296ee6352bbe885582e2c546e2ce (patch) | |
| tree | 44b80aaeb882ec990e143c72472e45b0f1a82cb4 /linux/drivers/media/video/bt8xx/bttv-cards.c | |
| parent | e92f78bc63e71d1572225b93b4ea0c31e6e6efc0 (diff) | |
| parent | aec12fb2da90fde6ec9056cec90f9a65a8b02305 (diff) | |
| download | mediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.gz mediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.bz2 | |
apply backout changeset
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 177b75ebc..0e6771643 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" @@ -3922,7 +3923,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 */ @@ -3982,7 +3983,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", |