Merge branch 'topic/snd_card_new-err' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / berry_charge.c

diff --git a/drivers/usb/misc/berry_charge.c b/drivers/usb/misc/berry_charge.c
index 24e2dc3148a492d6b1adaf40a484b21717ae72bd..c05a85bc5925c7ce1407ef504ec7fcfe77d57a91 100644 (file)
--- a/drivers/usb/misc/berry_charge.c
+++ b/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);