Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / ieee1394 / ohci1394.h

diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h
index e2e6194..7df0962 100644 (file)
--- a/drivers/ieee1394/ohci1394.h
+++ b/drivers/ieee1394/ohci1394.h
@@ -163,7 +163,7 @@ struct ti_ohci {
        } init_state;
 
         /* remapped memory spaces */
-        void *registers;
+        void __iomem *registers;
 
        /* dma buffer for self-id packets */
         quadlet_t *selfid_buf_cpu;
@@ -219,8 +219,8 @@ struct ti_ohci {
 
        int self_id_errors;
 
-       /* Tasklets for iso receive and transmit, used by video1394,
-        * amdtp and dv1394 */
+       /* Tasklets for iso receive and transmit, used by video1394
+        * and dv1394 */
 
        struct list_head iso_tasklet_list;
        spinlock_t iso_tasklet_list_lock;
@@ -236,6 +236,9 @@ struct ti_ohci {
 
 static inline int cross_bound(unsigned long addr, unsigned int size)
 {
+       if (size == 0)
+               return 0;
+
        if (size > PAGE_SIZE)
                return 1;