4 files changed, 13 insertions, 0 deletions

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 1e6daa36e5a7..84fa8a04eac4 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -285,6 +285,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
 };
 
 static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
+        {
+                I2C_BOARD_INFO("pcf8563", 0x51),
+        },
 };
 
 static int __init ap325rxa_devices_setup(void)
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 267b344099c0..836e80d5cb9f 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -554,6 +554,8 @@ struct dentry *sh_debugfs_root;
 static int __init sh_debugfs_init(void)
 {
         sh_debugfs_root = debugfs_create_dir("sh", NULL);
+        if (!sh_debugfs_root)
+                return -ENOMEM;
         if (IS_ERR(sh_debugfs_root))
                 return PTR_ERR(sh_debugfs_root);
 
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c
index 0e189ccd4a77..5ba067b26591 100644
--- a/arch/sh/mm/cache-debugfs.c
+++ b/arch/sh/mm/cache-debugfs.c
@@ -130,12 +130,18 @@ static int __init cache_debugfs_init(void)
         dcache_dentry = debugfs_create_file("dcache", S_IRUSR, sh_debugfs_root,
                                             (unsigned int *)CACHE_TYPE_DCACHE,
                                             &cache_debugfs_fops);
+        if (!dcache_dentry)
+                return -ENOMEM;
         if (IS_ERR(dcache_dentry))
                 return PTR_ERR(dcache_dentry);
 
         icache_dentry = debugfs_create_file("icache", S_IRUSR, sh_debugfs_root,
                                             (unsigned int *)CACHE_TYPE_ICACHE,
                                             &cache_debugfs_fops);
+        if (!icache_dentry) {
+                debugfs_remove(dcache_dentry);
+                return -ENOMEM;
+        }
         if (IS_ERR(icache_dentry)) {
                 debugfs_remove(dcache_dentry);
                 return PTR_ERR(icache_dentry);
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index cef727669c87..84241676265e 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -394,6 +394,8 @@ static int __init pmb_debugfs_init(void)
 
         dentry = debugfs_create_file("pmb", S_IFREG | S_IRUGO,
                                      sh_debugfs_root, NULL, &pmb_debugfs_fops);
+        if (!dentry)
+                return -ENOMEM;
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);