← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/usb/otg/isp1301_omap.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/otg/isp1301_omap.c
660
660
        int             ret = IRQ_NONE;
661
661
        struct isp1301  *isp = _isp;
662
662
 
663
 
        /* update ISP1301 transciever from OTG controller */
 
663
        /* update ISP1301 transceiver from OTG controller */
664
664
        if (otg_irq & OPRT_CHG) {
665
665
                omap_writew(OPRT_CHG, OTG_IRQ_SRC);
666
666
                isp1301_defer_work(isp, WORK_UPDATE_ISP);
755
755
                omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
756
756
                ret = IRQ_HANDLED;
757
757
 
758
 
        /* switch driver; the transciever code activates it,
 
758
        /* switch driver; the transceiver code activates it,
759
759
         * ungating the udc clock or resuming OHCI.
760
760
         */
761
761
        } else if (otg_irq & DRIVER_SWITCH) {
899
899
 
900
900
        if (otg_dev)
901
901
                status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
902
 
                                IRQF_DISABLED, DRIVER_NAME, isp);
 
902
                                0, DRIVER_NAME, isp);
903
903
        else
904
904
                status = -ENODEV;
905
905