---

yaml --- r: 127220 b: refs/heads/master c: b404299 h: refs/heads/master v: v3
git-mirror · Jan 7, 2009 · da3105d · da3105d
1 parent 38fba2b
commit da3105d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);