aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-05-03 14:17:57 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:58:23 -0400
commit5a11b6fe5d5ff146d951bc237c0e3f0330711baa (patch)
tree33cd6dcbee1892286908370aa4adf17f6b4e5702 /drivers/staging
parent6bc4631dbc535a906193fe8110556bf84e1786e3 (diff)
Fix compilation breakage with tm6000
Randy Dunlap <randy.dunlap@oracle.com> reported a breakage while compiling drivers/staging/tm6000, due to this change: commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c Author: Greg Kroah-Hartman <gregkh@suse.de> Date: Thu Apr 29 15:46:07 2010 -0700 USB: remove unused usb_buffer_alloc and usb_buffer_free macros Now that all callers are converted over, remove the compatibility functions and all is good. As the function got renamed, the rename should also be applied at tm6000. Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/tm6000/tm6000-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index f694bb8638e9..721d5a52948c 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -587,7 +587,7 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
587 usb_kill_urb(urb); 587 usb_kill_urb(urb);
588 usb_unlink_urb(urb); 588 usb_unlink_urb(urb);
589 if (dev->isoc_ctl.transfer_buffer[i]) { 589 if (dev->isoc_ctl.transfer_buffer[i]) {
590 usb_buffer_free(dev->udev, 590 usb_free_coherent(dev->udev,
591 urb->transfer_buffer_length, 591 urb->transfer_buffer_length,
592 dev->isoc_ctl.transfer_buffer[i], 592 dev->isoc_ctl.transfer_buffer[i],
593 urb->transfer_dma); 593 urb->transfer_dma);
@@ -674,7 +674,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev, unsigned int framesize)
674 } 674 }
675 dev->isoc_ctl.urb[i] = urb; 675 dev->isoc_ctl.urb[i] = urb;
676 676
677 dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev, 677 dev->isoc_ctl.transfer_buffer[i] = usb_alloc_coherent(dev->udev,
678 sb_size, GFP_KERNEL, &urb->transfer_dma); 678 sb_size, GFP_KERNEL, &urb->transfer_dma);
679 if (!dev->isoc_ctl.transfer_buffer[i]) { 679 if (!dev->isoc_ctl.transfer_buffer[i]) {
680 tm6000_err ("unable to allocate %i bytes for transfer" 680 tm6000_err ("unable to allocate %i bytes for transfer"