From patchwork Wed May 5 06:00:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 96986 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45616Qi028238 for ; Wed, 5 May 2010 06:01:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754727Ab0EEGBE (ORCPT ); Wed, 5 May 2010 02:01:04 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:52120 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753137Ab0EEGBD (ORCPT ); Wed, 5 May 2010 02:01:03 -0400 Received: by fxm10 with SMTP id 10so3900873fxm.19 for ; Tue, 04 May 2010 23:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=AgfTP02vSnzYsyRFOcrc/7bWxjbhtAeyVf4IXxVv7/U=; b=dv5e35dcQwbeS7NNHYzVftl55qRfKPpdZ83XW52m3xRMkj4NDA3Gc+9e4jHccZEpJN IP+NO3eJv9FisBX8GhaIn5IYMN7jFsbFTFxNZuqGLs18UBYOesEa5C4md+H2Hw87OZIZ mhjU1RIrMqXHoWloCvUUgECn1utZ8S/OmwCaE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=MUj0sGPwdbZ/+KJEkNOE4Qmd8oLG4XY/HtgPCnrJQikQT0zxBDMWFv2H1faLrx8Dyf Zd6TMfZiy+X3KMQui32CRhzPlnuN4X7g/f8P60QShkOXy4ZUzJw5s/ySy9jfFFRdCoqQ Hd9Y1G48QCanosN1t3e7xjcPNbpAaWNHU8MT0= Received: by 10.223.21.17 with SMTP id h17mr4909898fab.45.1273039262268; Tue, 04 May 2010 23:01:02 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id g28sm12838790fkg.58.2010.05.04.23.00.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 May 2010 23:01:01 -0700 (PDT) Date: Wed, 5 May 2010 08:00:47 +0200 From: Dan Carpenter To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab Subject: [patch -next 2/2] media/s2255drv: remove dead code Message-ID: <20100505060047.GF27064@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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]); Wed, 05 May 2010 06:01:06 +0000 (UTC) diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index ac9c40c..3c7a79f 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c @@ -2524,10 +2528,7 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn) static void s2255_stop_readpipe(struct s2255_dev *dev) { struct s2255_pipeinfo *pipe = &dev->pipe; - if (dev == NULL) { - s2255_dev_err(&dev->udev->dev, "invalid device\n"); - return; - } + pipe->state = 0; if (pipe->stream_urb) { /* cancel urb */