← 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/core/config.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/core/config.c
105
105
        ep->ss_ep_comp->extralen = i;
106
106
        buffer += i;
107
107
        size -= i;
108
 
        retval = buffer - buffer_start;
 
108
        retval = buffer - buffer_start + i;
109
109
        if (num_skipped > 0)
110
110
                dev_dbg(ddev, "skipped %d descriptor%s after %s\n",
111
111
                                num_skipped, plural(num_skipped),