From 61e8a60d7b849cfbe7fe912289be92fda4ec5a8d Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sat, 22 Aug 2009 20:24:49 +0200
Subject: [PATCH] --- yaml --- r: 165023 b: refs/heads/master c:
 2912282c06f219cf1634a624653c445329b37acf h: refs/heads/master i:   165021:
 7ba9804b02ee58dab25db7ac001bf0f781839448   165019:
 9eef2235a13b16f8119b0f8a8e13fdf937c24fc5   165015:
 82309bf591ad393450b2ec22a2165b571787d3ec   165007:
 5014946d4c0d436f6efc0facf42295ba1fd9d864   164991:
 63c47752f29571cd3edb27aa2755ac083ef0ebfa v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/usb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b4b6c863cfcd..fe81e43a65c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a448c9d8c58ff7d3f8cc2a8f835065460099b22d
+refs/heads/master: 2912282c06f219cf1634a624653c445329b37acf
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
index 43ee943d757a..30dd2636f262 100644
--- a/trunk/drivers/usb/core/usb.c
+++ b/trunk/drivers/usb/core/usb.c
@@ -914,11 +914,11 @@ int usb_buffer_map_sg(const struct usb_device *dev, int is_in,
 			|| !(bus = dev->bus)
 			|| !(controller = bus->controller)
 			|| !controller->dma_mask)
-		return -1;
+		return -EINVAL;
 
 	/* FIXME generic api broken like pci, can't report errors */
 	return dma_map_sg(controller, sg, nents,
-			is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
+			is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE) ? : -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(usb_buffer_map_sg);