diff --git a/TODO b/TODO
index 54386866747..5a828ea9011 100644
--- a/TODO
+++ b/TODO
@@ -1616,6 +1616,8 @@ o Other drivers (drivers/)
                  I2C usage.
                - I2C_SETADDRESS used with I2C_READ, I2C_WRITE, and I2C_WRITEREAD:
                  Similarly, address can and will be changed by other I2C usage.
+                 NOTE also that I2C_SETADDRESS also sets the address width (either
+                 7 or 10 bits).
                - I2C_TRANSFER:  This is the only interface that is properly self
                  contained and protected from most mult-tasking issues.  But even
                  this interface can suffer if there are differing frequency settings.
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index 1e736f5e074..e0fe18d21f4 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -87,7 +87,8 @@
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 #endif
 
-#if defined(CONFIG_OV2640_QCIF_RESOLUTION) || defined(CONFIG_OV2640_JPEG_QCIF_RESOLUTION)
+#if defined(CONFIG_OV2640_QCIF_RESOLUTION) || \
+    defined(CONFIG_OV2640_JPEG_QCIF_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  176
 #  define OV2460_IMAGE_HEIGHT 144
@@ -107,7 +108,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_QVGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_QVGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_QVGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_QVGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  320
 #  define OV2460_IMAGE_HEIGHT 240
@@ -127,7 +129,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_CIF_RESOLUTION) || defined(CONFIG_OV2640_JPEG_CIF_RESOLUTION)
+#elif defined(CONFIG_OV2640_CIF_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_CIF_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  352
 #  define OV2460_IMAGE_HEIGHT  288
@@ -147,7 +150,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_VGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_VGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_VGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_VGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  640
 #  define OV2460_IMAGE_HEIGHT 480
@@ -167,7 +171,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_SVGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_SVGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_SVGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_SVGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  800
 #  define OV2460_IMAGE_HEIGHT 600
@@ -187,7 +192,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_XVGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_XVGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_XVGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_XVGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  1024
 #  define OV2460_IMAGE_HEIGHT 768
@@ -207,7 +213,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_SXGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_SXVGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_SXGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_SXVGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  1280
 #  define OV2460_IMAGE_HEIGHT 1024
@@ -227,7 +234,8 @@
 #  undef CONFIG_OV2640_UXGA_RESOLUTION
 #  undef CONFIG_OV2640_JPEG_UXGA_RESOLUTION
 
-#elif defined(CONFIG_OV2640_UXGA_RESOLUTION) || defined(CONFIG_OV2640_JPEG_UXGA_RESOLUTION)
+#elif defined(CONFIG_OV2640_UXGA_RESOLUTION) || \
+      defined(CONFIG_OV2640_JPEG_UXGA_RESOLUTION)
 
 #  define OV2460_IMAGE_WIDTH  1600
 #  define OV2460_IMAGE_HEIGHT 1200
@@ -901,8 +909,8 @@ int ov2640_initialize(FAR struct i2c_dev_s *i2c)
 
   /* Configure I2C bus for the OV2640 */
 
-  I2C_SETADDRESS(i2c, CONFIG_OV2640_FREQUENCY, 7);
-  I2C_SETFREQUENCY(i2c, CONFIG_OV2640_I2CADDR);
+  I2C_SETADDRESS(i2c, CONFIG_OV2640_I2CADDR, 7);
+  I2C_SETFREQUENCY(i2c, CONFIG_OV2640_FREQUENCY);
 
   /* Reset the OVR2640 */