1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 0f4c18e6e60c..1272c41d4749 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -419,11 +419,15 @@ void __init omap3xxx_check_revision(void)
                         cpu_rev = "1.0";
                         break;
                 case 1:
-                /* FALLTHROUGH */
-                default:
                         omap_revision = AM335X_REV_ES2_0;
                         cpu_rev = "2.0";
                         break;
+                case 2:
+                /* FALLTHROUGH */
+                default:
+                        omap_revision = AM335X_REV_ES2_1;
+                        cpu_rev = "2.1";
+                        break;
                 }
                 break;
         case 0xb8f2:
@@ -644,13 +648,12 @@ void __init omap_soc_device_init(void)
         soc_dev_attr->revision = soc_rev;
 
         soc_dev = soc_device_register(soc_dev_attr);
-        if (IS_ERR_OR_NULL(soc_dev)) {
+        if (IS_ERR(soc_dev)) {
                 kfree(soc_dev_attr);
                 return;
         }
 
         parent = soc_device_to_device(soc_dev);
-        if (!IS_ERR_OR_NULL(parent))
-                device_create_file(parent, &omap_soc_attr);
+        device_create_file(parent, &omap_soc_attr);
 }
 #endif /* CONFIG_SOC_BUS */