diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:09:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:09:26 -0700 |
| commit | 8ab2055b3926acce31cafabe9f43242d489c291c (patch) | |
| tree | e565804029389dbf28304cc921b6d691ddf8dc7e | |
| parent | 2f100f190150f0353f68612b37629340b0fbb0db (diff) | |
| download | patches-8ab2055b3926acce31cafabe9f43242d489c291c.tar.gz | |
updates
| -rw-r--r-- | driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch | 4 | ||||
| -rw-r--r-- | usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch | 53 |
2 files changed, 56 insertions, 1 deletions
diff --git a/driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch b/driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch index f0420c4c0ca150..07e9b159ec0fe1 100644 --- a/driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch +++ b/driver-core.current/firmware_class-fix-memory-leak-free-allocated-pages.patch @@ -5,6 +5,10 @@ Subject: firmware_class: fix memory leak - free allocated pages To: linux-kernel@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>, Kay Sievers <kay.sievers@vrfy.org>, Greg Kroah-Hartman <gregkh@suse.de> Cc: David Woodhouse <dwmw2@infradead.org>, Johannes Berg <johannes@sipsolutions.net>, Greg Kroah-Hartman <gregkh@suse.de>, Ming Lei <tom.leiming@gmail.com>, Catalin Marinas <catalin.marinas@arm.com>, Kay Sievers <kay.sievers@vrfy.org>, Tomas Winkler <tomas.winkler@intel.com> Message-ID: <1272565577-26587-1-git-send-email-tomas.winkler@intel.com> +Status: RO +X-Status: A +Content-Length: 3937 +Lines: 135 From: David Woodhouse <dwmw2@infradead.org> diff --git a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch index 1d706620675df9..168423e5e82e74 100644 --- a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch +++ b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch @@ -55,6 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/media/video/usbvision/usbvision-core.c | 16 +++++----- drivers/media/video/uvc/uvc_video.c | 4 +- drivers/net/can/usb/ems_usb.c | 18 +++++------ + drivers/net/usb/ipheth.c | 24 ++++++--------- drivers/net/usb/kaweth.c | 12 +++---- drivers/net/wireless/ath/ar9170/usb.c | 8 ++--- drivers/net/wireless/zd1211rw/zd_usb.c | 10 +++--- @@ -73,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> sound/usb/ua101.c | 16 +++++----- sound/usb/usbaudio.c | 18 +++++------ sound/usb/usbmidi.c | 14 ++++----- - 50 files changed, 276 insertions(+), 277 deletions(-) + 51 files changed, 286 insertions(+), 291 deletions(-) --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl @@ -1079,6 +1080,56 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_kfree_skb(skb); atomic_dec(&dev->active_tx_urbs); +--- a/drivers/net/usb/ipheth.c ++++ b/drivers/net/usb/ipheth.c +@@ -128,17 +128,13 @@ static int ipheth_alloc_urbs(struct iphe + if (rx_urb == NULL) + goto free_tx_urb; + +- tx_buf = usb_buffer_alloc(iphone->udev, +- IPHETH_BUF_SIZE, +- GFP_KERNEL, +- &tx_urb->transfer_dma); ++ tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE, ++ GFP_KERNEL, &tx_urb->transfer_dma); + if (tx_buf == NULL) + goto free_rx_urb; + +- rx_buf = usb_buffer_alloc(iphone->udev, +- IPHETH_BUF_SIZE, +- GFP_KERNEL, +- &rx_urb->transfer_dma); ++ rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE, ++ GFP_KERNEL, &rx_urb->transfer_dma); + if (rx_buf == NULL) + goto free_tx_buf; + +@@ -150,8 +146,8 @@ static int ipheth_alloc_urbs(struct iphe + return 0; + + free_tx_buf: +- usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf, +- tx_urb->transfer_dma); ++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf, ++ tx_urb->transfer_dma); + free_rx_urb: + usb_free_urb(rx_urb); + free_tx_urb: +@@ -162,10 +158,10 @@ error_nomem: + + static void ipheth_free_urbs(struct ipheth_device *iphone) + { +- usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, +- iphone->rx_urb->transfer_dma); +- usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, +- iphone->tx_urb->transfer_dma); ++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, ++ iphone->rx_urb->transfer_dma); ++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, ++ iphone->tx_urb->transfer_dma); + usb_free_urb(iphone->rx_urb); + usb_free_urb(iphone->tx_urb); + } --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -1156,13 +1156,13 @@ err_fw: |