From patchwork Tue Jun 22 11:41:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 107375 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MBmQq8004333 for ; Tue, 22 Jun 2010 11:48:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752919Ab0FVLsZ (ORCPT ); Tue, 22 Jun 2010 07:48:25 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:50029 "EHLO mail.jetsystems.cz" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752441Ab0FVLsZ (ORCPT ); Tue, 22 Jun 2010 07:48:25 -0400 Received: from anemoi.localdomain ([217.66.174.142]) by mail.jetsystems.cz (Kerio Connect 7.0.0 patch 1); Tue, 22 Jun 2010 13:51:33 +0200 From: Jiri Slaby To: dmitry.torokhov@gmail.com Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, Jiri Slaby , Todd Fischer , Samuel Ortiz , linux-input@vger.kernel.org Subject: [PATCH] INPUT: tps6507x-ts, remove unneeded NULL test Date: Tue, 22 Jun 2010 13:41:02 +0200 Message-Id: <1277206862-27146-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 11:48:26 +0000 (UTC) diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c index 5b70a14..a644d18 100644 --- a/drivers/input/touchscreen/tps6507x-ts.c +++ b/drivers/input/touchscreen/tps6507x-ts.c @@ -355,9 +355,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev) struct tps6507x_ts *tsc = tps6507x_dev->ts; struct input_dev *input_dev = tsc->input_dev; - if (!tsc) - return 0; - cancel_delayed_work_sync(&tsc->work); destroy_workqueue(tsc->wq);