← Back to branch summary

~ubuntu-branches/ubuntu/precise/libmtp/precise-updates

« back to all changes in this revision

Viewing changes to src/libusb-glue.c

  • Committer: Package Import Robot
  • Author(s): Alessio Treglia
  • Date: 2012-04-03 08:45:30 UTC
  • mfrom: (0.2.6)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: package-import@ubuntu.com-20120403084530-4pzddlb80jviafad
* New upstream bugfix release:
  - Soname libmtp.so.9.0.3 - binary compatible.
  - Probably nailed the bugs in the Samsung Galaxy Tab S2 family
    of devices. Ignacio Martinez helped us fixing this!
  - Build fixes by Alessio Treglia and others.
  - A horde of new devices in the database.
* Remove patches applied upstream:
  - 0001-broken_object_info.patch
  - 0002-devicedb_updates.patch
  - 2001-pkgconfig_requires.patch
* Refresh 1001-kfreebsd_hurd_ftbfs.patch.
* Refresh symbols file.
* Update debian/copyright.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libusb-glue.c
3
3
 * Low-level USB interface glue towards libusb.
4
4
 *
5
5
 * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
6
 
 * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se>
 
6
 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
7
7
 * Copyright (C) 2006-2007 Marcus Meissner
8
8
 * Copyright (C) 2007 Ted Bullock
9
9
 * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com>
1538
1538
        ret = PTP_RC_OK;
1539
1539
        switch(wait) {
1540
1540
        case PTP_EVENT_CHECK:
1541
 
                result=USB_BULK_READ(ptp_usb->handle,
 
1541
                result = USB_BULK_READ(ptp_usb->handle,
1542
1542
                                     ptp_usb->intep,
1543
1543
                                     (char *) &usbevent,
1544
1544
                                     sizeof(usbevent),
1552
1552
                if (result < 0) ret = PTP_ERROR_IO;
1553
1553
                break;
1554
1554
        case PTP_EVENT_CHECK_FAST:
1555
 
                result=USB_BULK_READ(ptp_usb->handle,
 
1555
                result = USB_BULK_READ(ptp_usb->handle,
1556
1556
                                     ptp_usb->intep,
1557
1557
                                     (char *) &usbevent,
1558
1558
                                     sizeof(usbevent),