X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Fmach-omap2%2Fid.c;h=b2f56684c337bddc44e080370ed1ffcdc19d0a46;hb=19e831b272e6db5884be085be66e44da975c73a9;hp=d85c24918c177d176fd191aa1ebcfaff5ce90f74;hpb=316e376b658f67cd63351a55093ac5038637a330;p=deliverable%2Flinux.git

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index d85c24918c17..b2f56684c337 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -46,6 +46,7 @@ u32 omap_features;
 
 unsigned int omap_rev(void)
 {
+	WARN_ON_ONCE(!omap_revision || omap_revision == -1);
 	return omap_revision;
 }
 EXPORT_SYMBOL(omap_rev);
@@ -669,9 +670,9 @@ void __init dra7xxx_check_revision(void)
 		case 0:
 			omap_revision = DRA722_REV_ES1_0;
 			break;
+		case 1:
 		default:
-			/* If we have no new revisions */
-			omap_revision = DRA722_REV_ES1_0;
+			omap_revision = DRA722_REV_ES2_0;
 			break;
 		}
 		break;