From 60a04a916964ada1bf3cb46e2593aacd4eb3d683 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 3 May 2010 15:17:57 -0300
Subject: [PATCH] --- yaml --- r: 193074 b: refs/heads/master c:
 5a11b6fe5d5ff146d951bc237c0e3f0330711baa h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b2a7fa112a0..d7daa0642fb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bc4631dbc535a906193fe8110556bf84e1786e3
+refs/heads/master: 5a11b6fe5d5ff146d951bc237c0e3f0330711baa
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index f694bb8638e9..721d5a52948c 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -587,7 +587,7 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
 			usb_kill_urb(urb);
 			usb_unlink_urb(urb);
 			if (dev->isoc_ctl.transfer_buffer[i]) {
-				usb_buffer_free(dev->udev,
+				usb_free_coherent(dev->udev,
 						urb->transfer_buffer_length,
 						dev->isoc_ctl.transfer_buffer[i],
 						urb->transfer_dma);
@@ -674,7 +674,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev, unsigned int framesize)
 		}
 		dev->isoc_ctl.urb[i] = urb;
 
-		dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev,
+		dev->isoc_ctl.transfer_buffer[i] = usb_alloc_coherent(dev->udev,
 			sb_size, GFP_KERNEL, &urb->transfer_dma);
 		if (!dev->isoc_ctl.transfer_buffer[i]) {
 			tm6000_err ("unable to allocate %i bytes for transfer"