From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric.y.miao@gmail.com (Eric Miao) Date: Tue, 01 Sep 2009 17:52:24 +0800 Subject: [PATCH 3/5] Treo680: fix freed GPIO in treo680_irda_shutdown() In-Reply-To: <200908311936.30705.marek.vasut@gmail.com> References: <1251739561-28972-1-git-send-email-sleep_walker@suse.cz> <1251739561-28972-3-git-send-email-sleep_walker@suse.cz> <1251739561-28972-4-git-send-email-sleep_walker@suse.cz> <200908311936.30705.marek.vasut@gmail.com> Message-ID: <4A9CEED8.1000705@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Marek Vasut wrote: > Dne Po 31. srpna 2009 19:25:59 Tom?? ?ech napsal(a): >> From: Tom?? ?ech >> >> >> Signed-off-by: Tom?? ?ech >> --- >> arch/arm/mach-pxa/treo680.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-pxa/treo680.c b/arch/arm/mach-pxa/treo680.c >> index 57bccc3..d88114c 100644 >> --- a/arch/arm/mach-pxa/treo680.c >> +++ b/arch/arm/mach-pxa/treo680.c >> @@ -325,7 +325,7 @@ err1: >> >> static void treo680_irda_shutdown(struct device *dev) >> { >> - gpio_free(GPIO_NR_TREO680_AMP_EN); >> + gpio_free(GPIO_NR_TREO680_IR_EN); >> } >> >> static struct pxaficp_platform_data treo680_ficp_info = { > > ... > > Seems OK to me, I think the first three patches can go in as is, Eric, could > you merge them? Thanks > > Acked-by: Marek Vasut This has been merged by Russell in his patch tracking system, so really don't need to go via my tree now.