From patchwork Fri Jan 10 07:44:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 3465001 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D3BC7C02DD for ; Fri, 10 Jan 2014 07:45:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E62E20123 for ; Fri, 10 Jan 2014 07:45:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48AA12010C for ; Fri, 10 Jan 2014 07:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120AbaAJHpO (ORCPT ); Fri, 10 Jan 2014 02:45:14 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:58218 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751660AbaAJHod (ORCPT ); Fri, 10 Jan 2014 02:44:33 -0500 Received: by mail-pa0-f51.google.com with SMTP id fa1so4450257pad.10 for ; Thu, 09 Jan 2014 23:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g6c7NihzP7PVdPzweYE/maTKDJOAa0H36i29Q4/O81s=; b=bS31gWQT2/szf2nFZL5i3n5Cb+FmWdLiZnlIfJjbIT8KWrDihfB4yT04SIeYj5iEjX mvchgBpztCluUKPCYehgE32MJy3NhwpBr1GKfzytZsxCFh58GN7JgPjjOdRgaRzgic8f UZno8OqDKz4XThlHsUr7gBwsVnjVOpMhMpzl8WGHHDHsFpRQO6OdX1xWJ+W0mEgCI9Qr VwPZkNSmamHvFEKI2JE/cCAau5K8DeLa7pukBtIFIdFF85rtjD+h0IlNRGrT8hFUob5t oGc8kfQQEBjsDjZg325lC63cJOEFCHC5aWx6RE2FsrCuinp4/KaTu0yUUVTHH3ze66Vd Nd3Q== X-Received: by 10.68.164.165 with SMTP id yr5mr9455054pbb.146.1389339873128; Thu, 09 Jan 2014 23:44:33 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-67-188-112-76.hsd1.ca.comcast.net. [67.188.112.76]) by mx.google.com with ESMTPSA id sq7sm15128366pbc.19.2014.01.09.23.44.31 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 09 Jan 2014 23:44:32 -0800 (PST) From: Dmitry Torokhov To: Christopher Heiny Cc: Andrew Duggan , Vincent Huang , Vivian Ly , Daniel Rosenberg , Linus Walleij , Benjamin Tissoires , Linux Input , Linux Kernel Subject: [PATCH 3/4] Input: synaptics-rmi4 - fix I2C functionality check Date: Thu, 9 Jan 2014 23:44:26 -0800 Message-Id: <1389339867-8399-3-git-send-email-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1389339867-8399-1-git-send-email-dmitry.torokhov@gmail.com> References: <1389339867-8399-1-git-send-email-dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When adapter does not support required functionality (I2C_FUNC_I2C) we were returning 0 to the upper layers, making them believe that device bound successfully. Signed-off-by: Dmitry Torokhov Acked-by: Christopher Heiny --- drivers/input/rmi4/rmi_i2c.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/input/rmi4/rmi_i2c.c b/drivers/input/rmi4/rmi_i2c.c index cdc8527..c176218 100644 --- a/drivers/input/rmi4/rmi_i2c.c +++ b/drivers/input/rmi4/rmi_i2c.c @@ -193,11 +193,10 @@ static int rmi_i2c_probe(struct i2c_client *client, pdata->sensor_name ? pdata->sensor_name : "-no name-", client->addr, pdata->attn_gpio); - retval = i2c_check_functionality(client->adapter, I2C_FUNC_I2C); - if (!retval) { - dev_err(&client->dev, "i2c_check_functionality error %d.\n", - retval); - return retval; + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { + dev_err(&client->dev, + "adapter does not support required functionality.\n"); + return -ENODEV; } if (pdata->gpio_config) {