From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastian Blank Subject: [PATCH 2/7] Input: wacom - Get features from driver info Date: Thu, 7 Jan 2010 19:29:36 +0100 Message-ID: <20100107182936.GA12913@wavehammer.waldi.eu.org> References: <20100107182553.GA11236@wavehammer.waldi.eu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Return-path: Received: from wavehammer.waldi.eu.org ([82.139.201.20]:56848 "EHLO wavehammer.waldi.eu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752022Ab0AGSkv (ORCPT ); Thu, 7 Jan 2010 13:40:51 -0500 Content-Disposition: inline In-Reply-To: <20100107182553.GA11236@wavehammer.waldi.eu.org> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng Get the features information from the driver info of the usb device id structure provided by the caller. The device ids and feature structs are strong coupled using indices. Signed-off-by: Bastian Blank --- drivers/input/tablet/wacom_sys.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index ab42c25..b0f3fc3 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -532,7 +532,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i struct usb_endpoint_descriptor *endpoint; struct wacom *wacom; struct wacom_wac *wacom_wac; - struct wacom_features *features; + struct wacom_features *features = (void *)id->driver_info; struct input_dev *input_dev; int error = -ENOMEM; @@ -557,7 +557,9 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i usb_make_path(dev, wacom->phys, sizeof(wacom->phys)); strlcat(wacom->phys, "/input0", sizeof(wacom->phys)); - wacom_wac->features = features = get_wacom_feature(id); + if (!features) + features = get_wacom_feature(id); + wacom_wac->features = features; BUG_ON(features->pktlen > WACOM_PKGLEN_MAX); input_dev->name = wacom_wac->features->name; -- 1.6.5.7 -- You're dead, Jim. -- McCoy, "Amok Time", stardate 3372.7