From da3105da8f4baacf509e04fe95e2fbe2d16fa6dd Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Fri, 1 Feb 2008 22:44:40 +0100
Subject: [PATCH] --- yaml --- r: 127220 b: refs/heads/master c:
 b404299f6bfdf5aa7315e521b570e33f082b2f9e h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/misc/berry_charge.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41a0e7db07eb..42987c7ca29c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff8973d9468ea07e61ef492dd8c806a6e1a76ac1
+refs/heads/master: b404299f6bfdf5aa7315e521b570e33f082b2f9e
diff --git a/trunk/drivers/usb/misc/berry_charge.c b/trunk/drivers/usb/misc/berry_charge.c
index 24e2dc3148a4..c05a85bc5925 100644
--- a/trunk/drivers/usb/misc/berry_charge.c
+++ b/trunk/drivers/usb/misc/berry_charge.c
@@ -123,6 +123,11 @@ static int berry_probe(struct usb_interface *intf,
 {
 	struct usb_device *udev = interface_to_usbdev(intf);
 
+	if (udev->bus_mA < 500) {
+		dbg(&udev->dev, "Not enough power to charge available\n");
+		return -ENODEV;
+	}
+
 	dbg(&udev->dev, "Power is set to %dmA\n",
 	    udev->actconfig->desc.bMaxPower * 2);