On Mon, Jun 02, 2014 at 07:45:25PM +0200, Emil Goode wrote:
> The variable err is not initialized here, this patch uses it
> to store an eventual error value from devm_clk_get().
>
> Signed-off-by: Emil Goode <emilgoode@xxxxxxxxx>
> Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> ---
> drivers/usb/misc/usb3503.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
> index f43c619..c86c3fa 100644
> --- a/drivers/usb/misc/usb3503.c
> +++ b/drivers/usb/misc/usb3503.c
> @@ -191,9 +191,13 @@ static int usb3503_probe(struct usb3503 *hub)
> hub->port_off_mask = 0;
>
> clk = devm_clk_get(dev, "refclk");
> - if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) {
> - dev_err(dev, "unable to request refclk (%d)\n", err);
> - return PTR_ERR(clk);
> + if (IS_ERR(clk)) {
> + err = PTR_ERR(clk);
> + if (err != -ENOENT) {
> + dev_err(dev, "unable to request refclk (%d)\n",
> + err);
> + return err;
> + }
> }
>
> if (!IS_ERR(clk)) {
> --
> 1.7.10.4
This patch fails to apply to my tree :(
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
