← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-ti-omap4/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/rtc/rtc-at91rm9200.c

  • Committer: Package Import Robot
  • Author(s): Brad Figg, Brad Figg
  • Date: 2013-06-08 09:09:23 UTC
  • Revision ID: package-import@ubuntu.com-20130608090923-ibtnp6edtrn3sxik
Tags: 3.5.0-226.39
[ Brad Figg ]

UBUNTU: Fixup missing abi files causing FTBS

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/rtc/rtc-at91rm9200.c
297
297
        if (ret) {
298
298
                printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n",
299
299
                                irq);
300
 
                return ret;
 
300
                goto err_unmap;
301
301
        }
302
302
 
303
303
        /* cpu init code should really have flagged this device as
309
309
        rtc = rtc_device_register(pdev->name, &pdev->dev,
310
310
                                &at91_rtc_ops, THIS_MODULE);
311
311
        if (IS_ERR(rtc)) {
312
 
                free_irq(irq, pdev);
313
 
                return PTR_ERR(rtc);
 
312
                ret = PTR_ERR(rtc);
 
313
                goto err_free_irq;
314
314
        }
315
315
        platform_set_drvdata(pdev, rtc);
316
316
 
317
317
        printk(KERN_INFO "AT91 Real Time Clock driver.\n");
318
318
        return 0;
 
319
 
 
320
err_free_irq:
 
321
        free_irq(irq, pdev);
 
322
err_unmap:
 
323
        iounmap(at91_rtc_regs);
 
324
 
 
325
        return ret;
319
326
}
320
327
 
321
328
/*
332
339
        free_irq(irq, pdev);
333
340
 
334
341
        rtc_device_unregister(rtc);
 
342
        iounmap(at91_rtc_regs);
335
343
        platform_set_drvdata(pdev, NULL);
336
344
 
337
345
        return 0;