← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/mfd/wm831x-irq.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mfd/wm831x-irq.c
515
515
                                 0xffff);
516
516
        }
517
517
 
518
 
        if (!irq) {
519
 
                dev_warn(wm831x->dev,
520
 
                         "No interrupt specified - functionality limited\n");
521
 
                return 0;
522
 
        }
523
 
 
524
518
        if (!pdata || !pdata->irq_base) {
525
519
                dev_err(wm831x->dev,
526
520
                        "No interrupt base specified, no interrupts\n");
567
561
#endif
568
562
        }
569
563
 
570
 
        ret = request_threaded_irq(irq, NULL, wm831x_irq_thread,
571
 
                                   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
572
 
                                   "wm831x", wm831x);
573
 
        if (ret != 0) {
574
 
                dev_err(wm831x->dev, "Failed to request IRQ %d: %d\n",
575
 
                        irq, ret);
576
 
                return ret;
 
564
        if (irq) {
 
565
                ret = request_threaded_irq(irq, NULL, wm831x_irq_thread,
 
566
                                           IRQF_TRIGGER_LOW | IRQF_ONESHOT,
 
567
                                           "wm831x", wm831x);
 
568
                if (ret != 0) {
 
569
                        dev_err(wm831x->dev, "Failed to request IRQ %d: %d\n",
 
570
                                irq, ret);
 
571
                        return ret;
 
572
                }
 
573
        } else {
 
574
                dev_warn(wm831x->dev,
 
575
                         "No interrupt specified - functionality limited\n");
577
576
        }
578
577
 
 
578
 
 
579
 
579
580
        /* Enable top level interrupts, we mask at secondary level */
580
581
        wm831x_reg_write(wm831x, WM831X_SYSTEM_INTERRUPTS_MASK, 0);
581
582