summaryrefslogtreecommitdiff
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-28 16:46:59 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-28 16:46:59 +0100
commit2011a067281565494494aee194ca5081e52d6c3f (patch)
treee0b21ad43e6eeb0c67945026be71d1278c93c695 /drivers/usb/class/cdc-acm.c
parent63fb70859f987f2b3b8028fa467fd63336315e9c (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
downloadolio-linux-3.10-2011a067281565494494aee194ca5081e52d6c3f.tar.xz
olio-linux-3.10-2011a067281565494494aee194ca5081e52d6c3f.zip
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r--drivers/usb/class/cdc-acm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index fab23ee8702..20104443081 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -849,9 +849,10 @@ static void acm_write_buffers_free(struct acm *acm)
{
int i;
struct acm_wb *wb;
+ struct usb_device *usb_dev = interface_to_usbdev(acm->control);
for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++) {
- usb_buffer_free(acm->dev, acm->writesize, wb->buf, wb->dmah);
+ usb_buffer_free(usb_dev, acm->writesize, wb->buf, wb->dmah);
}
}