diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /sound/oss/nec_vrc5477.c | |
parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) |
Merge branch 'master' into 85xx
Diffstat (limited to 'sound/oss/nec_vrc5477.c')
-rw-r--r-- | sound/oss/nec_vrc5477.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c index da9728e1772..d459bdb1415 100644 --- a/sound/oss/nec_vrc5477.c +++ b/sound/oss/nec_vrc5477.c @@ -1381,11 +1381,11 @@ static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file, int val, ret; #ifdef VRC5477_AC97_DEBUG - for (count=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]); count++) { + for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) { if (ioctl_str[count].cmd == cmd) break; } - if (count < sizeof(ioctl_str)/sizeof(ioctl_str[0])) + if (count < ARRAY_SIZE(ioctl_str)) printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str); else printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd); |