---

yaml --- r: 67871 b: refs/heads/master c: fdf99c9 h: refs/heads/master i: 67869: f137e37 67867: cd5e22e 67863: 9db9728 67855: 8a412a1 67839: 132368d v: v3
git-mirror · Oct 12, 2007 · e488b85 · e488b85
1 parent af752b0
commit e488b85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12943f097e5a4a0550f52f98ab8f476435e2ce15
+refs/heads/master: fdf99c9ec10cb9cd44be3ac0bd007a49ac6dc751
diff --git a/trunk/drivers/usb/misc/berry_charge.c b/trunk/drivers/usb/misc/berry_charge.c
@@ -71,7 +71,7 @@ static int magic_charge(struct usb_device *udev)
 	if (retval != 2) {
 		dev_err(&udev->dev, "First magic command failed: %d.\n",
 			retval);
-		return retval;
+		goto exit;
 	}
 
 	dbg(&udev->dev, "Sending second magic command\n");
@@ -80,14 +80,16 @@ static int magic_charge(struct usb_device *udev)
 	if (retval != 0) {
 		dev_err(&udev->dev, "Second magic command failed: %d.\n",
 			retval);
-		return retval;
+		goto exit;
 	}
 
 	dbg(&udev->dev, "Calling set_configuration\n");
 	retval = usb_driver_set_configuration(udev, 1);
 	if (retval)
 		dev_err(&udev->dev, "Set Configuration failed :%d.\n", retval);
 
+exit:
+	kfree(dummy_buffer);
 	return retval;
 }
 
@@ -112,6 +114,7 @@ static int magic_dual_mode(struct usb_device *udev)
 	if (retval)
 		dev_err(&udev->dev, "Set Configuration failed :%d.\n", retval);
 
+	kfree(dummy_buffer);
 	return retval;
 }