From 7edaf0d27f5502f7d788d53db6aba25712c58095 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 25 Aug 2012 21:57:06 +0200 Subject: [PATCH] --- yaml --- r: 325892 b: refs/heads/master c: 44fd6c0266d3ec752be1bf003015544ea45f473f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/lpc32xx_udc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e42f9b4329a5..490e94f5e45e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85b8614d722389202af298e1bf8a599c431fef19 +refs/heads/master: 44fd6c0266d3ec752be1bf003015544ea45f473f diff --git a/trunk/drivers/usb/gadget/lpc32xx_udc.c b/trunk/drivers/usb/gadget/lpc32xx_udc.c index a0195f20bf3b..f696fb9b136d 100644 --- a/trunk/drivers/usb/gadget/lpc32xx_udc.c +++ b/trunk/drivers/usb/gadget/lpc32xx_udc.c @@ -3176,7 +3176,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev) udc->usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg"); if (IS_ERR(udc->usb_otg_clk)) { dev_err(udc->dev, "failed to acquire USB otg clock\n"); - retval = PTR_ERR(udc->usb_slv_clk); + retval = PTR_ERR(udc->usb_otg_clk); goto usb_otg_clk_get_fail; }