From e488b8579f3c7814e4e721083cdfc931140c18d7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 23 Aug 2007 15:55:34 -0700 Subject: [PATCH] --- yaml --- r: 67871 b: refs/heads/master c: fdf99c9ec10cb9cd44be3ac0bd007a49ac6dc751 h: refs/heads/master i: 67869: f137e3709dc19fa13225eb575ecc8cf9da29faba 67867: cd5e22e94dc98fb4589254724ac576525201b84b 67863: 9db9728097c9978dde5ee2ca999eaa19cc4e8b76 67855: 8a412a148c54313503d8d4cb7651c1a548d321e4 67839: 132368dd610ddc8b17cbdeb1bc3bab7e3faf9439 v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/berry_charge.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9e39e3a3634..0ad2ab7d0941 100644 --- 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 index 92c1d2768df9..24e2dc3148a4 100644 --- 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,7 +80,7 @@ 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"); @@ -88,6 +88,8 @@ static int magic_charge(struct usb_device *udev) 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; }