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);