From df66f3de2a8cacb633b1413afd0ea30e089ae0cc Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 27 May 2010 18:10:08 +0200
Subject: [PATCH] --- yaml --- r: 207958 b: refs/heads/master c:
 dc6eb27bdd3d214568f7d77a317c202c10222511 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/host/whci/qset.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac70b8ba3d68..beeb36be4350 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e1c3b467ffd9d6eb725dda544f6fd10e471ea71
+refs/heads/master: dc6eb27bdd3d214568f7d77a317c202c10222511
diff --git a/trunk/drivers/usb/host/whci/qset.c b/trunk/drivers/usb/host/whci/qset.c
index ab5a14fbfeeb..dc0ab8382f5d 100644
--- a/trunk/drivers/usb/host/whci/qset.c
+++ b/trunk/drivers/usb/host/whci/qset.c
@@ -475,7 +475,7 @@ static int qset_add_urb_sg(struct whc *whc, struct whc_qset *qset, struct urb *u
 			    || (prev_end & (WHCI_PAGE_SIZE-1))
 			    || (dma_addr & (WHCI_PAGE_SIZE-1))
 			    || std->len + WHCI_PAGE_SIZE > QTD_MAX_XFER_SIZE) {
-				if (std->len % qset->max_packet != 0)
+				if (std && std->len % qset->max_packet != 0)
 					return -EINVAL;
 				std = qset_new_std(whc, qset, urb, mem_flags);
 				if (std == NULL) {