diff for duplicates of <4E4AE535.4070400@freescale.com> diff --git a/a/1.txt b/N1/1.txt index e2c3fef..9e69812 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,35 +1,37 @@ On 08/16/2011 04:27 AM, Chunhe Lan wrote: -> Nand flash nodes with the property status="disabled" are not +> Nand flash nodes with the property status=3D"disabled" are not > usable and so avoid adding "disabled" nand flash devices with > the system. -> +>=20 > Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> > --- > drivers/mtd/nand/fsl_elbc_nand.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) -> -> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c +>=20 +> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_el= +bc_nand.c > index 33d8aad..8212c12 100644 > --- a/drivers/mtd/nand/fsl_elbc_nand.c > +++ b/drivers/mtd/nand/fsl_elbc_nand.c > @@ -1,6 +1,6 @@ > /* Freescale Enhanced Local Bus Controller NAND driver > * -> - * Copyright © 2006-2007, 2010 Freescale Semiconductor -> + * Copyright © 2006-2007, 2010-2011 Freescale Semiconductor +> - * Copyright =C2=A9 2006-2007, 2010 Freescale Semiconductor +> + * Copyright =C2=A9 2006-2007, 2010-2011 Freescale Semiconductor > * > * Authors: Nick Spence <nick.spence@freescale.com>, > * Scott Wood <scottwood@freescale.com> -> @@ -849,6 +849,9 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) +> @@ -849,6 +849,9 @@ static int __devinit fsl_elbc_nand_probe(struct pla= +tform_device *pdev) > struct device *dev; -> struct device_node *node = pdev->dev.of_node; -> +> struct device_node *node =3D pdev->dev.of_node; +> =20 > + if (!of_device_is_available(node)) > + return -ENODEV; > + > if (!fsl_lbc_ctrl_dev || !fsl_lbc_ctrl_dev->regs) > return -ENODEV; -> lbc = fsl_lbc_ctrl_dev->regs; +> lbc =3D fsl_lbc_ctrl_dev->regs; Same comment as the other patch -- unavailable devices should already not be getting probed. Also, this subject line makes it sound like this diff --git a/a/content_digest b/N1/content_digest index 147e297..66b0cf5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,37 +11,39 @@ "\00:1\0" "b\0" "On 08/16/2011 04:27 AM, Chunhe Lan wrote:\n" - "> Nand flash nodes with the property status=\"disabled\" are not\n" + "> Nand flash nodes with the property status=3D\"disabled\" are not\n" "> usable and so avoid adding \"disabled\" nand flash devices with\n" "> the system.\n" - "> \n" + ">=20\n" "> Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>\n" "> ---\n" "> drivers/mtd/nand/fsl_elbc_nand.c | 5 ++++-\n" "> 1 files changed, 4 insertions(+), 1 deletions(-)\n" - "> \n" - "> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c\n" + ">=20\n" + "> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_el=\n" + "bc_nand.c\n" "> index 33d8aad..8212c12 100644\n" "> --- a/drivers/mtd/nand/fsl_elbc_nand.c\n" "> +++ b/drivers/mtd/nand/fsl_elbc_nand.c\n" "> @@ -1,6 +1,6 @@\n" "> /* Freescale Enhanced Local Bus Controller NAND driver\n" "> *\n" - "> - * Copyright \302\251 2006-2007, 2010 Freescale Semiconductor\n" - "> + * Copyright \302\251 2006-2007, 2010-2011 Freescale Semiconductor\n" + "> - * Copyright =C2=A9 2006-2007, 2010 Freescale Semiconductor\n" + "> + * Copyright =C2=A9 2006-2007, 2010-2011 Freescale Semiconductor\n" "> *\n" "> * Authors: Nick Spence <nick.spence@freescale.com>,\n" "> * Scott Wood <scottwood@freescale.com>\n" - "> @@ -849,6 +849,9 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev)\n" + "> @@ -849,6 +849,9 @@ static int __devinit fsl_elbc_nand_probe(struct pla=\n" + "tform_device *pdev)\n" "> \tstruct device *dev;\n" - "> \tstruct device_node *node = pdev->dev.of_node;\n" - "> \n" + "> \tstruct device_node *node =3D pdev->dev.of_node;\n" + "> =20\n" "> +\tif (!of_device_is_available(node))\n" "> +\t\treturn -ENODEV;\n" "> +\n" "> \tif (!fsl_lbc_ctrl_dev || !fsl_lbc_ctrl_dev->regs)\n" "> \t\treturn -ENODEV;\n" - "> \tlbc = fsl_lbc_ctrl_dev->regs;\n" + "> \tlbc =3D fsl_lbc_ctrl_dev->regs;\n" "\n" "Same comment as the other patch -- unavailable devices should already\n" "not be getting probed. Also, this subject line makes it sound like this\n" @@ -49,4 +51,4 @@ "\n" -Scott -7cbb148ecf11c50eaa2863a7187ff120788d474a2f0530207a5f80f7f8e462b6 +41ad3a36d231923acf9d720fd58f472912fc514aaaad9b4f7c4ad42beaed1a8b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.