diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2013-01-08 14:13:40 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-01-17 08:45:43 -0500 |
commit | 8df4ce75189807783c4bb4e4337e0f89283e6ca3 (patch) | |
tree | 7c83ec6075a1d5d217df04d3897800832aeac524 /drivers/usb/musb/omap2430.c | |
parent | 99d17cfa3bbc6f4edb175f819af59c6b9e245e82 (diff) |
usb: musb: omap2430: kill redundant assignments in omap2430_probe()
Commit 00a0b1d58af873d842580dcac55f3b156c3a4077 (usb: musb: omap: Add device
tree support for omap musb glue) added assignments of the 'ret' variable to
-ENOMEM on *some* error paths of the calls to devm_kzalloc(), while that
variable was already pre-initialized for to that value, so these assignments
were completely redundant. Kill them, fixing overindented string, while at it.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
-rw-r--r-- | drivers/usb/musb/omap2430.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index c293dbeb8b24..cd06166affee 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
@@ -532,15 +532,13 @@ static int omap2430_probe(struct platform_device *pdev) | |||
532 | if (!pdata) { | 532 | if (!pdata) { |
533 | dev_err(&pdev->dev, | 533 | dev_err(&pdev->dev, |
534 | "failed to allocate musb platfrom data\n"); | 534 | "failed to allocate musb platfrom data\n"); |
535 | ret = -ENOMEM; | ||
536 | goto err2; | 535 | goto err2; |
537 | } | 536 | } |
538 | 537 | ||
539 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); | 538 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
540 | if (!data) { | 539 | if (!data) { |
541 | dev_err(&pdev->dev, | 540 | dev_err(&pdev->dev, |
542 | "failed to allocate musb board data\n"); | 541 | "failed to allocate musb board data\n"); |
543 | ret = -ENOMEM; | ||
544 | goto err2; | 542 | goto err2; |
545 | } | 543 | } |
546 | 544 | ||