On Wed, 2016-02-17 at 14:18 -0600, Jonathon Jongsma wrote:
> Already acked in previous series
pushed
>
>
> On Thu, 2016-02-11 at 18:04 +0200, Dmitry Fleytman wrote:
> > From: Christophe Fergeau <cfergeau@xxxxxxxxxx>
> >
> > The Windows-specific version duplicates some code from
> > spice_usb_device_manager_libdev_match(), this commit
> > switches to using that helper instead.
> > ---
> > src/usb-device-manager.c | 13 ++++---------
> > 1 file changed, 4 insertions(+), 9 deletions(-)
> >
> > diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
> > index 647edd0..344b4bf 100644
> > --- a/src/usb-device-manager.c
> > +++ b/src/usb-device-manager.c
> > @@ -1907,19 +1907,14 @@ static gboolean
> > spice_usb_device_equal_libdev(SpiceUsbDevice *device,
> > libusb_device *libdev)
> > {
> > - int vid1, vid2, pid1, pid2;
> > + int vid, pid;
> >
> > if ((device == NULL) || (libdev == NULL))
> > return FALSE;
> >
> > - vid1 = spice_usb_device_get_vid(device);
> > - pid1 = spice_usb_device_get_pid(device);
> > -
> > - if (!spice_usb_device_manager_get_libdev_vid_pid(libdev,
> > &vid2, &pid2)) {
> > - return FALSE;
> > - }
> > -
> > - return ((vid1 == vid2) && (pid1 == pid2));
> > + vid = spice_usb_device_get_vid(device);
> > + pid = spice_usb_device_get_pid(device);
> > + return spice_usb_device_manager_libdev_match(libdev, vid,
> > pid);
> > }
> > #endif
> >
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel