Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[mv-sheeva.git] / drivers / usb / mon / mon_text.c

diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 4d0be130f49b5282af7b70654b94ead4e0cf2e9b..a545d65f6e57b2e53bd81f104c90e2bd514e5028 100644 (file)
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -159,11 +159,9 @@ static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb,
                if (src == NULL)
                        return 'Z';     /* '0' would be not as pretty. */
        } else {
-               struct scatterlist *sg = urb->sg->sg;
+               struct scatterlist *sg = urb->sg;
 
-               /* If IOMMU coalescing occurred, we cannot trust sg_page */
-               if (urb->sg->nents != urb->num_sgs ||
-                               PageHighMem(sg_page(sg)))
+               if (PageHighMem(sg_page(sg)))
                        return 'D';
 
                /* For the text interface we copy only the first sg buffer */