diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c
index ed8cb3bf6ab35dcf05c9215adaaf51003d92af8e..be2138d872f3da86d36929fd0f4f47948babe536 100644
--- a/arch/arm/src/sama5/sam_clockconfig.c
+++ b/arch/arm/src/sama5/sam_clockconfig.c
@@ -610,11 +610,11 @@ void __ramfunc__ sam_clockconfig(void)
    * clock.
    */
 
+#if defined(NEED_PLLSETUP)
 #ifdef CONFIG_SAMA5_BOOT_CS0FLASH
   if (config)
 #endif /* CONFIG_SAMA5_BOOT_CS0FLASH */
     {
-#if defined(NEED_PLLSETUP)
       /* Enable main oscillator (if it has not already been selected) */
 
       sam_enablemosc();
@@ -645,10 +645,10 @@ void __ramfunc__ sam_clockconfig(void)
       /* Finally, elect the PLLA output as the input clock for PCK and MCK. */
 
       sam_selectplla();
+    }
 #endif /* NEED_PLLSETUP */
 
-      /* Setup USB clocking */
+  /* Setup USB clocking */
 
-      sam_usbclockconfig();
-    }
+  sam_usbclockconfig();
 }
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index b9e24567f69fa5c2b4dda47299cf2341e57fe130..153109cbcd7f68fc43e3182203c00867b414c2ad 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -2256,7 +2256,7 @@ int cdcacm_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
 
   /* Initialize the serial driver sub-structure */
 
-      /* The initial state is disconnected */
+  /* The initial state is disconnected */
 
 #ifdef CONFIG_SERIAL_REMOVABLE
   priv->serdev.disconnected = true;