---

yaml --- r: 364711 b: refs/heads/master c: 482ef1d h: refs/heads/master i: 364709: f92d1c2 364707: 8332ecd 364703: cd0b2b1 v: v3
git-mirror · Mar 18, 2013 · 4565663 · 4565663
1 parent cb3287b
commit 4565663
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 853f97b5f3886012d293257db74d65b14f958940
+refs/heads/master: 482ef1d2fec5e5d44d97f7e20b4ccf3d3604aaae
diff --git a/trunk/drivers/usb/gadget/uvc.h b/trunk/drivers/usb/gadget/uvc.h
@@ -98,8 +98,6 @@ extern unsigned int uvc_gadget_trace_param;
 #define DRIVER_VERSION				"0.1.0"
 #define DRIVER_VERSION_NUMBER			KERNEL_VERSION(0, 1, 0)
 
-#define DMA_ADDR_INVALID			(~(dma_addr_t)0)
-
 #define UVC_NUM_REQUESTS			4
 #define UVC_MAX_REQUEST_SIZE			64
 #define UVC_MAX_EVENTS				4

diff --git a/trunk/drivers/usb/gadget/uvc_v4l2.c b/trunk/drivers/usb/gadget/uvc_v4l2.c
@@ -41,7 +41,6 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data)
 
 	req->length = min_t(unsigned int, uvc->event_length, data->length);
 	req->zero = data->length < uvc->event_length;
-	req->dma = DMA_ADDR_INVALID;
 
 	memcpy(req->buf, data->data, data->length);
 

diff --git a/trunk/drivers/usb/gadget/uvc_video.c b/trunk/drivers/usb/gadget/uvc_video.c
@@ -245,7 +245,6 @@ uvc_video_alloc_requests(struct uvc_video *video)
 
 		video->req[i]->buf = video->req_buffer[i];
 		video->req[i]->length = 0;
-		video->req[i]->dma = DMA_ADDR_INVALID;
 		video->req[i]->complete = uvc_video_complete;
 		video->req[i]->context = video;