From patchwork Wed Oct 13 20:57:38 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Antonio Ospite <ospite@studenti.unina.it>
X-Patchwork-Id: 251381
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9DKwYl2029399
	for <patchwork-linux-input@patchwork.kernel.org>;
	Wed, 13 Oct 2010 20:58:34 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751585Ab0JMU6d (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Wed, 13 Oct 2010 16:58:33 -0400
Received: from smtp207.alice.it ([82.57.200.103]:37128 "EHLO
	smtp207.alice.it"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751083Ab0JMU6d (ORCPT <rfc822;linux-input@vger.kernel.org>);
	Wed, 13 Oct 2010 16:58:33 -0400
Received: from jcn (79.3.140.53) by smtp207.alice.it (8.5.124.08)
	id 4C9E16C901542FBD; Wed, 13 Oct 2010 22:58:31 +0200
Received: from ao2 by jcn with local (Exim 4.72)
	(envelope-from <ospite@studenti.unina.it>)
	id 1P68P7-0000zo-8h; Wed, 13 Oct 2010 22:58:29 +0200
From: Antonio Ospite <ospite@studenti.unina.it>
To: linux-input@vger.kernel.org
Cc: Antonio Ospite <ospite@studenti.unina.it>, Alan Ott <alan@signal11.us>,
	Jiri Kosina <jkosina@suse.cz>, Jim Paris <jim@jtan.com>,
	"Ranulf Doswell" <ralf@ranulf.net>,
	=?UTF-8?q?Mikko=20Virkkil=C3=A4?= <mvirkkil@cc.hut.fi>, falktx@gmail.com
Subject: [RFC, PATCH 2/2] HID: hid-sony,
	use HID_QUIRK_FORCE_OUT_CONTROL_EP for Sixaxis
Date: Wed, 13 Oct 2010 22:57:38 +0200
Message-Id: <1287003458-3791-3-git-send-email-ospite@studenti.unina.it>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <4CA9DD89.2010106@signal11.us>
References: <4CA9DD89.2010106@signal11.us>
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;
	]yA5<GWI5`6u&+ ; 6b'@y|8w"wB;
	4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
	!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 13 Oct 2010 20:58:35 +0000 (UTC)


diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index d61f268..7b0c70a 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -110,8 +110,10 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 		goto err_free;
 	}
 
-	if (sc->quirks & SIXAXIS_CONTROLLER_USB)
+	if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
 		ret = sixaxis_set_operational_usb(hdev);
+		hdev->quirks |= HID_QUIRK_FORCE_OUT_CONTROL_EP;
+	}
 	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
 		ret = sixaxis_set_operational_bt(hdev);
 	else