On Mon, 22 Sep 2014, Octavian Purdila wrote:
> Signed-off-by: Octavian Purdila <octavian.purdila@xxxxxxxxx>
> ---
> drivers/mfd/viperboard.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
Looks fine, but won't apply without patch 1.
> diff --git a/drivers/mfd/viperboard.c b/drivers/mfd/viperboard.c
> index 5f62f4e..d27c131 100644
> --- a/drivers/mfd/viperboard.c
> +++ b/drivers/mfd/viperboard.c
> @@ -59,10 +59,8 @@ static int vprbrd_probe(struct usb_interface *interface,
>
> /* allocate memory for our device state and initialize it */
> vb = kzalloc(sizeof(*vb), GFP_KERNEL);
> - if (vb == NULL) {
> - dev_err(&interface->dev, "Out of memory\n");
> + if (vb == NULL)
> return -ENOMEM;
> - }
>
> vb->buf = kzalloc(sizeof(struct vprbrd_i2c_write_msg), GFP_KERNEL);
> if (vb->buf == NULL) {
> @@ -109,11 +107,9 @@ static int vprbrd_probe(struct usb_interface *interface,
> return 0;
>
> error:
> - if (vb) {
> - usb_put_dev(vb->usb_dev);
> - kfree(vb->buf);
> - kfree(vb);
> - }
> + usb_put_dev(vb->usb_dev);
> + kfree(vb->buf);
> + kfree(vb);
>
> return ret;
> }
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
