aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJody McIntyre <scjody@steamballoon.com>2005-05-17 00:54:05 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 10:59:23 -0400
commit74a01d11c92c06a0ceac88ca306d507a8186e7f6 (patch)
treeb91c62c0092e3e3782af731f47936a75bc9cb776
parent8d98c5cd41d1932bb76a3945b4e8dea889224d87 (diff)
[PATCH] ieee1394: fix cross_bound check for null ISO packets
Fix cross_bound to not return 1 for zero-length regions. Fixes regression when sending null ISO packets. Signed-off-by: Jody McIntyre <scjody@steamballoon.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ieee1394/ohci1394.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h
index d1758d409610..cc66c1cae250 100644
--- a/drivers/ieee1394/ohci1394.h
+++ b/drivers/ieee1394/ohci1394.h
@@ -236,6 +236,9 @@ struct ti_ohci {
236 236
237static inline int cross_bound(unsigned long addr, unsigned int size) 237static inline int cross_bound(unsigned long addr, unsigned int size)
238{ 238{
239 if (size == 0)
240 return 0;
241
239 if (size > PAGE_SIZE) 242 if (size > PAGE_SIZE)
240 return 1; 243 return 1;
241 244