diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-08-15 03:05:38 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:45 -0400 |
commit | 9c3bd6833a4df1abd9ecd3b51492b8949bf9cd11 (patch) | |
tree | 6835d90852cd40289ad970b979b694ed55203e60 /drivers/net/irda/irport.c | |
parent | 9a673e563e543a5c8a6f9824562e55e807b8a56c (diff) |
[IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE()
Several IR drivers used "for (i = 0; i < 4; i++)" to walk their
dev_self[] table. Better to use ARRAY_SIZE(). And fix ali-ircc so it
won't run off the end if we find too many adapters.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/irport.c')
-rw-r--r-- | drivers/net/irda/irport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index 44efd49bf4a..ba4f3eb988b 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c | |||
@@ -1090,7 +1090,7 @@ static int __init irport_init(void) | |||
1090 | { | 1090 | { |
1091 | int i; | 1091 | int i; |
1092 | 1092 | ||
1093 | for (i=0; (io[i] < 2000) && (i < 4); i++) { | 1093 | for (i=0; (io[i] < 2000) && (i < ARRAY_SIZE(dev_self)); i++) { |
1094 | if (irport_open(i, io[i], irq[i]) != NULL) | 1094 | if (irport_open(i, io[i], irq[i]) != NULL) |
1095 | return 0; | 1095 | return 0; |
1096 | } | 1096 | } |
@@ -1112,7 +1112,7 @@ static void __exit irport_cleanup(void) | |||
1112 | 1112 | ||
1113 | IRDA_DEBUG( 4, "%s()\n", __FUNCTION__); | 1113 | IRDA_DEBUG( 4, "%s()\n", __FUNCTION__); |
1114 | 1114 | ||
1115 | for (i=0; i < 4; i++) { | 1115 | for (i=0; i < ARRAY_SIZE(dev_self); i++) { |
1116 | if (dev_self[i]) | 1116 | if (dev_self[i]) |
1117 | irport_close(dev_self[i]); | 1117 | irport_close(dev_self[i]); |
1118 | } | 1118 | } |