]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
USB: power availability check for berry_charge
authorOliver Neukum <oliver@neukum.org>
Fri, 1 Feb 2008 21:44:40 +0000 (22:44 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Jan 2009 17:59:51 +0000 (09:59 -0800)
this introduces a sanity check into berry_charge to give up before
damage is done if we lack juice.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/misc/berry_charge.c

index 24e2dc3148a492d6b1adaf40a484b21717ae72bd..c05a85bc5925c7ce1407ef504ec7fcfe77d57a91 100644 (file)
@@ -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);