From patchwork Thu Jun 2 05:41:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 98346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D5B17B6F88 for ; Thu, 2 Jun 2011 15:45:08 +1000 (EST) Received: from localhost ([::1]:38590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QS0iN-0007cX-BK for incoming@patchwork.ozlabs.org; Thu, 02 Jun 2011 01:45:03 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QS0et-0007bt-Uj for qemu-devel@nongnu.org; Thu, 02 Jun 2011 01:41:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QS0es-0003Mh-0N for qemu-devel@nongnu.org; Thu, 02 Jun 2011 01:41:27 -0400 Received: from smtpout3.three.com.au ([202.124.68.59]:36232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QS0er-0003MM-5Y for qemu-devel@nongnu.org; Thu, 02 Jun 2011 01:41:25 -0400 Received: from auumvs2fe02.three.com.au (auhgvpsmtp.three.com.au [10.176.77.86]) by smtpout3.three.com.au (Postfix) with ESMTP id 1CF40A0769; Thu, 2 Jun 2011 15:41:24 +1000 (EST) Received: from localhost.localdomain ([10.224.20.109]) by auumvs2fe02.three.com.au with ESMTP id p525g7Lq013689-p525g7Lt013689; Thu, 2 Jun 2011 15:42:11 +1000 From: Brad Hards To: claunia@claunia.com, qemu-devel@nongnu.org Date: Thu, 2 Jun 2011 15:41:05 +1000 Message-Id: <1306993270-24144-3-git-send-email-bradh@frogmouth.net> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306993270-24144-1-git-send-email-bradh@frogmouth.net> References: <1306993270-24144-1-git-send-email-bradh@frogmouth.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.124.68.59 Cc: Brad Hards Subject: [Qemu-devel] [PATCH 2/7] usb-uvc: compile fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Looks like function signature changed. Signed-off-by: Brad Hards --- hw/usb-uvc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/usb-uvc.c b/hw/usb-uvc.c index e88ee00..c9c8f77 100644 --- a/hw/usb-uvc.c +++ b/hw/usb-uvc.c @@ -307,8 +307,9 @@ static void usb_uvc_handle_reset(USBDevice *dev) DPRINTF("Reset called\n"); } -static int usb_uvc_handle_control(USBDevice *dev, int request, int value, - int index, int length, uint8_t *data) +static int usb_uvc_handle_control(USBDevice *dev, USBPacket *p, int request, + int value, int index, int length, + uint8_t *data) { int ret = 0; USBUVCState *s = (USBUVCState *)dev;