rpms/libmtp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix inverted boolean logic, mea culpa

Browse Source
This commit is contained in:
Linus Walleij 2011-01-24 19:33:42 +01:00
parent 4f89406544
commit 51268617c1
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-inverted-boolean-logic.patch Normal file
View File

@ -0,0 +1,29 @@
From 3230d1d0f2afbae4145f11437f623d1611d855a2 Mon Sep 17 00:00:00 2001
From: Linus Walleij <triad@df.lth.se>
Date: Mon, 24 Jan 2011 19:31:25 +0100
Subject: [PATCH] Fix inverted boolean logic...
---
src/libusb-glue.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index ca8c47d..a702eed 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -237,9 +237,9 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
* contain any MTP interface, update this the day
* you find some weird combination...
*/
- if (dev->descriptor.bDeviceClass != USB_CLASS_PER_INTERFACE &&
- dev->descriptor.bDeviceClass != USB_CLASS_COMM &&
- dev->descriptor.bDeviceClass != USB_CLASS_PTP &&
+ if (dev->descriptor.bDeviceClass != USB_CLASS_PER_INTERFACE ||
+ dev->descriptor.bDeviceClass != USB_CLASS_COMM ||
+ dev->descriptor.bDeviceClass != USB_CLASS_PTP ||
dev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC) {
return 0;
}
--
1.7.3.4

7
libmtp.spec
View File

@ -3,13 +3,14 @@
Name: libmtp
Version: 1.0.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A software library for MTP media players
URL: http://libmtp.sourceforge.net/
Group: System Environment/Libraries
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: 0001-Fixup-device-OS-descriptor-probe-code.patch
Patch1: 0001-Fix-inverted-boolean-logic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
Requires: udev
@ -53,6 +54,7 @@ library for MTP media players.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure --disable-static
@ -128,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 24 2011 Linus Walleij <triad@df.lth.se> 1.0.4-3
- Screwed up boolean logic in last patch, fixing it.
* Wed Jan 19 2011 Linus Walleij <triad@df.lth.se> 1.0.4-2
- Testing out a patch to be more careful when probing devices.