← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to drivers/usb/host/ohci-hub.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/ohci-hub.c
580
580
            temp |= 0x0008;
581
581
        desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);
582
582
 
583
 
        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
 
583
        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
584
584
        rh = roothub_b (ohci);
585
 
        memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
586
 
        desc->bitmap [0] = rh & RH_B_DR;
 
585
        memset(desc->u.hs.DeviceRemovable, 0xff,
 
586
                        sizeof(desc->u.hs.DeviceRemovable));
 
587
        desc->u.hs.DeviceRemovable[0] = rh & RH_B_DR;
587
588
        if (ohci->num_ports > 7) {
588
 
                desc->bitmap [1] = (rh & RH_B_DR) >> 8;
589
 
                desc->bitmap [2] = 0xff;
 
589
                desc->u.hs.DeviceRemovable[1] = (rh & RH_B_DR) >> 8;
 
590
                desc->u.hs.DeviceRemovable[2] = 0xff;
590
591
        } else
591
 
                desc->bitmap [1] = 0xff;
 
592
                desc->u.hs.DeviceRemovable[1] = 0xff;
592
593
}
593
594
 
594
595
/*-------------------------------------------------------------------------*/