X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fusb%2Fcore%2Fusb.c;fp=drivers%2Fusb%2Fcore%2Fusb.c;h=30dd2636f2624962fbeb840a0f73d2b2d5cb36c4;hb=2912282c06f219cf1634a624653c445329b37acf;hp=43ee943d757aaaafa200c982f32135678b24e975;hpb=a448c9d8c58ff7d3f8cc2a8f835065460099b22d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 43ee943..30dd263 100644
--- a/drivers/usb/core/usb.c
+++ b/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);