From 0203b752ba7fa4d59dedd73a1333a834eb6b0e7e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 6 Sep 2010 13:57:22 -0300
Subject: [PATCH] --- yaml --- r: 219061 b: refs/heads/master c:
 76e241d421e785dacdc8f7a4c39ecc42c8313a9e h: refs/heads/master i:   219059:
 d95afe0f9caa1a1107670de9f9a287f21c516132 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/gspca/konica.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e3c85ec7c19..000cfdb25c1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41f424ba4ddc9ea0b241363a24007073c49a6116
+refs/heads/master: 76e241d421e785dacdc8f7a4c39ecc42c8313a9e
diff --git a/trunk/drivers/media/video/gspca/konica.c b/trunk/drivers/media/video/gspca/konica.c
index 8cdf1af4257e..3de67ee5c230 100644
--- a/trunk/drivers/media/video/gspca/konica.c
+++ b/trunk/drivers/media/video/gspca/konica.c
@@ -319,7 +319,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 			return -ENOMEM;
 		}
 		gspca_dev->urb[n] = urb;
-		urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev,
+		urb->transfer_buffer = usb_alloc_coherent(gspca_dev->dev,
 						packet_size * SD_NPKT,
 						GFP_KERNEL,
 						&urb->transfer_dma);