From e244c5936281bdb5f0426dea75649cb218405a05 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 27 Oct 2009 15:18:46 -0400 Subject: [PATCH] --- yaml --- r: 174911 b: refs/heads/master c: d697cdda43939a80432863e2e26df6701ce72b63 h: refs/heads/master i: 174909: 774142c26cb87110df26fd3b1a608d871fcc2449 174907: 9770f43763a2c7bdb0cea98b7b31935675559d38 174903: 2f951f820f5454f2ce4a1c1910772b851698fec6 174895: 82b3d5205840157ec8afa5cc9d3d438540853f2d 174879: c56519a0451250455a193574807587b845c0bb1e 174847: e0e0ec017ac4bff85eaa6db2c218923279f8c896 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 87e9aabd5c02..5ef33b6e6f32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dccd574cccad950d9ed9bc192eae4089c6044d9d +refs/heads/master: d697cdda43939a80432863e2e26df6701ce72b63 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index 2ac115015229..708c63826100 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -45,7 +45,6 @@ struct usb_hub { /* buffer for urb ... with extra space in case of babble */ char (*buffer)[8]; - dma_addr_t buffer_dma; /* DMA address for buffer */ union { struct usb_hub_status hub; struct usb_port_status port; @@ -869,8 +868,7 @@ static int hub_configure(struct usb_hub *hub, int maxp, ret; char *message = "out of memory"; - hub->buffer = usb_buffer_alloc(hdev, sizeof(*hub->buffer), GFP_KERNEL, - &hub->buffer_dma); + hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL); if (!hub->buffer) { ret = -ENOMEM; goto fail; @@ -1111,8 +1109,6 @@ static int hub_configure(struct usb_hub *hub, usb_fill_int_urb(hub->urb, hdev, pipe, *hub->buffer, maxp, hub_irq, hub, endpoint->bInterval); - hub->urb->transfer_dma = hub->buffer_dma; - hub->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; /* maybe cycle the hub leds */ if (hub->has_indicators && blinkenlights) @@ -1162,8 +1158,7 @@ static void hub_disconnect(struct usb_interface *intf) kfree(hub->port_owners); kfree(hub->descriptor); kfree(hub->status); - usb_buffer_free(hub->hdev, sizeof(*hub->buffer), hub->buffer, - hub->buffer_dma); + kfree(hub->buffer); kref_put(&hub->kref, hub_release); }