← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/host/sl811-hcd.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/sl811-hcd.c
719
719
                /* port status seems weird until after reset, so
720
720
                 * force the reset and make khubd clean up later.
721
721
                 */
722
 
                if (sl811->stat_insrmv & 1)
723
 
                        sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION;
724
 
                else
725
 
                        sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION);
726
 
 
727
 
                sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION;
 
722
                sl811->port1 |= (1 << USB_PORT_FEAT_C_CONNECTION)
 
723
                                | (1 << USB_PORT_FEAT_CONNECTION);
728
724
 
729
725
        } else if (irqstat & SL11H_INTMASK_RD) {
730
726
                if (sl811->port1 & (1 << USB_PORT_FEAT_SUSPEND)) {