From patchwork Thu Jan 7 18:29:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Blank X-Patchwork-Id: 71624 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o07IhBE3022865 for ; Thu, 7 Jan 2010 18:43:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753459Ab0AGSmL (ORCPT ); Thu, 7 Jan 2010 13:42:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753448Ab0AGSkx (ORCPT ); Thu, 7 Jan 2010 13:40:53 -0500 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 Received: by wavehammer.waldi.eu.org (Postfix, from userid 1000) id AD7E3541BF; Thu, 7 Jan 2010 19:29:36 +0100 (CET) Date: Thu, 7 Jan 2010 19:29:36 +0100 From: Bastian Blank To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng Subject: [PATCH 2/7] Input: wacom - Get features from driver info Message-ID: <20100107182936.GA12913@wavehammer.waldi.eu.org> Mail-Followup-To: Bastian Blank , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng References: <20100107182553.GA11236@wavehammer.waldi.eu.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100107182553.GA11236@wavehammer.waldi.eu.org> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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;