linux-kernel - linux-next: manual merge of the mtd tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090601140044.4786a99f.sfr@canb.auug.org.au>
Date:	Mon, 1 Jun 2009 14:00:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Woodhouse <dwmw2@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vladimir Barinov <vova.barinov@...il.com>,
	Lothar Wassmann <LW@...O-electronics.de>,
	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
Subject: linux-next: manual merge of the mtd tree with Linus' tree

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/mxc_nand.c between commit
8541c1180a355c4da283fc6b03a92c0233823c1b ("mtd: MXC NAND driver fixes
(v5)") from Linus' tree and commit
ccd93854d44710adaa02cecf0ef5f24ab383dd20 ("[MTD] Remove mtd->
{suspend,resume} calls from board drivers") from the mtd tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/mtd/nand/mxc_nand.c
index 40c2608,65040de..0000000
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@@ -1021,11 -1015,9 +1021,10 @@@ static int mxcnd_suspend(struct platfor
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
 -
 -	/* Disable the NFC clock */
 -	clk_disable(nfc_clk);	/* FIXME */
 +	if (mtd) {
- 		ret = mtd->suspend(mtd);
 +		/* Disable the NFC clock */
 +		clk_disable(host->clk);
 +	}
  
  	return ret;
  }
@@@ -1038,12 -1028,8 +1037,11 @@@ static int mxcnd_resume(struct platform
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 -	/* Enable the NFC clock */
 -	clk_enable(nfc_clk);	/* FIXME */
 +
 +	if (mtd) {
 +		/* Enable the NFC clock */
 +		clk_enable(host->clk);
- 		mtd->resume(mtd);
 +	}
  
  	return ret;
  }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/