Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332746
b: refs/heads/master
c: 3d10095
h: refs/heads/master
v: v3
  • Loading branch information
Fabio Estevam authored and David Woodhouse committed Sep 29, 2012
1 parent e018087 commit eb84ff5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b277f77e5d6cac15bedde341b571a81fb0db2260
refs/heads/master: 3d10095a941a29253102625d8710fe31a1a24b56
9 changes: 6 additions & 3 deletions trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/clk.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
Expand Down Expand Up @@ -114,7 +117,7 @@ int common_nfc_set_geometry(struct gpmi_nand_data *this)
/* We use the same ECC strength for all chunks. */
geo->ecc_strength = get_ecc_strength(this);
if (!geo->ecc_strength) {
pr_err("We get a wrong ECC strength.\n");
pr_err("wrong ECC strength.\n");
return -EINVAL;
}

Expand Down Expand Up @@ -1685,9 +1688,9 @@ static int __init gpmi_nand_init(void)

err = platform_driver_register(&gpmi_nand_driver);
if (err == 0)
printk(KERN_INFO "GPMI NAND driver registered. (IMX)\n");
pr_info("driver registered.\n");
else
pr_err("i.MX GPMI NAND driver registration failed\n");
pr_err("driver registration failed.\n");
return err;
}

Expand Down

0 comments on commit eb84ff5

Please sign in to comment.