From patchwork Sat Mar 6 09:25:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 2890 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sat, 06 Mar 2010 09:25:31 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Sat, 06 Mar 2010 10:10:08 -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 1NnqGJ-0003Ej-7V; Sat, 06 Mar 2010 09:25:31 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752456Ab0CFJZ3 (ORCPT + 1 other); Sat, 6 Mar 2010 04:25:29 -0500 Received: from relay02.digicable.hu ([92.249.128.188]:38082 "EHLO relay02.digicable.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362Ab0CFJZ2 (ORCPT ); Sat, 6 Mar 2010 04:25:28 -0500 Received: from [92.249.229.128] by relay02.digicable.hu with esmtpa id 1NnqGF-0003sv-Eu ; Sat, 06 Mar 2010 10:25:27 +0100 Message-ID: <4B921F84.3000803@freemail.hu> Date: Sat, 06 Mar 2010 10:25:24 +0100 From: =?ISO-8859-1?Q?N=E9meth_M=E1rton?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Jean Delvare , Mauro Carvalho Chehab , Douglas Schilling Landgraf CC: V4L Mailing List Subject: [PATCH] bttv: fix compiler warning before kernel 2.6.30 References: <20100216182152.44129e46@hyperion.delvare> <4B921F5F.4000905@freemail.hu> In-Reply-To: <4B921F5F.4000905@freemail.hu> X-Original: 92.249.229.128 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh Fix the following compiler warnings when compiling before Linux kernel version 2.6.30: bttv-i2c.c: In function 'init_bttv_i2c': bttv-i2c.c:440: warning: control reaches end of non-void function Signed-off-by: Márton Németh Acked-by: Jean Delvare --- -- 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 -r 41c5482f2dac linux/drivers/media/video/bt8xx/bttv-i2c.c --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Thu Mar 04 02:49:46 2010 -0300 +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Sat Mar 06 10:22:55 2010 +0100 @@ -409,7 +409,6 @@ } if (0 == btv->i2c_rc && i2c_scan) do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) return btv->i2c_rc; } @@ -417,6 +416,7 @@ /* Instantiate the I2C IR receiver device, if present */ void __devinit init_bttv_i2c_ir(struct bttv *btv) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) if (0 == btv->i2c_rc) { struct i2c_board_info info; /* The external IR receiver is at i2c address 0x34 (0x35 for