From patchwork Mon May 24 15:59:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 3487 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Mon, 24 May 2010 16:01:12 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Mon, 24 May 2010 13:02:27 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OGa5Y-0000ua-9E; Mon, 24 May 2010 16:01:12 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757294Ab0EXQAB (ORCPT + 1 other); Mon, 24 May 2010 12:00:01 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:52812 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757303Ab0EXP76 (ORCPT ); Mon, 24 May 2010 11:59:58 -0400 Received: by pvg3 with SMTP id 3so100032pvg.19 for ; Mon, 24 May 2010 08:59:58 -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:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=uwoU8FzuOe7Y4R+9n19BgqZ4n2IqCTTV00fMtuRGkIA=; b=oq1u1ITH/k7C59hzdM997QXws0f6muOj3ai24aZndRLNirupJD0GN+dr+Tv2zJYRsv lHm8/5pCQBCbWKEFg3pAeCxeI5nMv7mEDbnJoCemnt5w4f9iY5+b0Hn+gfLl7gV5F46h jeWn4P79df+Pf8kl/fKNi8tHEPUJwNlSS1GZ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=dZK+c6hj6WySQn0M9qHVhNFeMmDvNKdrWh16lxjhFbnG/FRVWJ+dcds2WHkQPmBCiG GtwAdn6SPxCbzFojliWUh9RzoWx1rKuT3cncjHiVu6/4S26XH6DFQVu3qfVUlZO9wuod xT659X8HKcXfzrDJOF6Rvl8SOi48Yn8TpOrlQ= Received: by 10.143.169.1 with SMTP id w1mr3290475wfo.88.1274716798228; Mon, 24 May 2010 08:59:58 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id 22sm3598740pzk.9.2010.05.24.08.59.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 May 2010 08:59:57 -0700 (PDT) Date: Mon, 24 May 2010 17:59:36 +0200 From: Dan Carpenter To: Jean Delvare Cc: Mauro Carvalho Chehab , "Beholder Intl. Ltd. Dmitry Belimov" , hermann pitton , Douglas Schilling Landgraf , linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch v2] video/saa7134: change dprintk() to i2cdprintk() Message-ID: <20100524155936.GZ22515@bicker> References: <20100522201535.GI22515@bicker> <20100522225921.585b2d72@hyperion.delvare> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100522225921.585b2d72@hyperion.delvare> 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 The problem is that dprintk() dereferences "dev" which is null here. The i2cdprintk() uses "ir" so that's OK. Also removed a duplicated break statement. Signed-off-by: Dan Carpenter Acked-by: Jean Delvare --- v2: Jean Delvare suggested that I use i2cdprintk() instead of modifying dprintk(). -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index e5565e2..7691bf2 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -141,8 +141,8 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) struct saa7134_dev *dev = ir->c->adapter->algo_data; if (dev == NULL) { - dprintk("get_key_flydvb_trio: " - "gir->c->adapter->algo_data is NULL!\n"); + i2cdprintk("get_key_flydvb_trio: " + "gir->c->adapter->algo_data is NULL!\n"); return -EIO; } @@ -195,8 +195,8 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key, /* is needed to access GPIO. Used by the saa_readl macro. */ struct saa7134_dev *dev = ir->c->adapter->algo_data; if (dev == NULL) { - dprintk("get_key_msi_tvanywhere_plus: " - "gir->c->adapter->algo_data is NULL!\n"); + i2cdprintk("get_key_msi_tvanywhere_plus: " + "gir->c->adapter->algo_data is NULL!\n"); return -EIO; } @@ -815,7 +815,6 @@ int saa7134_input_init1(struct saa7134_dev *dev) mask_keyup = 0x020000; polling = 50; /* ms */ break; - break; } if (NULL == ir_codes) { printk("%s: Oops: IR config error [card=%d]\n",