From 1262c4b3f7e5ed494204c7ca07241c4fb5a96ecf Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 5 Jul 2007 19:04:27 -0300 Subject: [PATCH] --- yaml --- r: 61371 b: refs/heads/master c: ba2cf98249795f03792d1409a3b6aaa589ea0745 h: refs/heads/master i: 61369: f36dde65bd8f703ecb2c2807be491a151bb1a9b8 61367: 0682f281b497f3ade2495a3269a86bb74f99be07 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/stradis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3176c0eae04..d459309137e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59800555f79a52394c3c29e19e448b4635daf14c +refs/heads/master: ba2cf98249795f03792d1409a3b6aaa589ea0745 diff --git a/trunk/drivers/media/video/stradis.c b/trunk/drivers/media/video/stradis.c index 3e736be5de84..eb220461ac77 100644 --- a/trunk/drivers/media/video/stradis.c +++ b/trunk/drivers/media/video/stradis.c @@ -1321,7 +1321,7 @@ static int saa_ioctl(struct inode *inode, struct file *file, u32 format; if (copy_from_user(&p, arg, sizeof(p))) return -EFAULT; - if (p.palette < sizeof(palette2fmt) / sizeof(u32)) { + if (p.palette < ARRAY_SIZE(palette2fmt)) { format = palette2fmt[p.palette]; saa->win.color_fmt = format; saawrite(format | 0x60,