MFC 262695, 262708, 262709, 262710, 262711, 262728, 262870, 262877, 262880,

    262885, 262891, 262903,

  imx6: Add a tunable to set the number of active cores, enable SMP by default.

  ffec: Fix multicast filtering.

  Allwinner a10/a20...
  - Add gpio and clock bits for A10/A20's EMAC ethernet controller driver
    - EMAC gpio configuration
    - EMAC clock activation
  - Add Static Random Access Memory controller driver for A10/A20.
      A10/A20's SRAM is used by devices, such as CPU, EMAC,
      for extra fast memory or as cache.
  - Add EMAC 10/100 Ethernet controller driver for A10/A20.
      It is available mostly in A10 devices like Hackberry, Marsboard,
      Mele A1000, A2000, A100 HTPC, cubieboard1 and A20 device
      like cubieboard2.
      TX performance can be improved using both channels 0 and 1.
      RX performance is poor and needs improvement with the assistance of
      external DMA controller in case there
  - Add EMAC and SRAM controller entries to FDT.
  - Add EMAC device to kernel config files and enable EMAC, SRAM drivers.

  OMAP: When calculating the MPU freq, make sure not to overflow.

  Vybrid:
  - Add driver for Port control and interrupts (PORT).
  - Export panel info to DTS
  - Reset all the layers before setup first one
  - Enable display

  nandfs: Slight code reordering to make error branch last.

  Add option TMPFS to arm/conf/DEFAULTS, remove it from the few configs
  that have it individually.  Concensus on freebsd-arm@ is that it should
  be included in all ARM kernels.

  Fix the arm sys_sigreturn(): its argument is a struct ucontext, not a
  struct sigframe containing the struct ucontext.

1 files changed, 3 insertions, 3 deletions

diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index 5242318..fda2b9ed 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -988,10 +988,10 @@ calculate_geometry(int fd)
 	/* Get storage erase unit size */
 	if (!is_nand)
 		erasesize = NANDFS_DEF_ERASESIZE;
-	else if (ioctl(fd, NAND_IO_GET_CHIP_PARAM, &chip_params) == -1)
-		errx(1, "Cannot ioctl(NAND_IO_GET_CHIP_PARAM)");
-	else
+	else if (ioctl(fd, NAND_IO_GET_CHIP_PARAM, &chip_params) != -1)
 		erasesize = chip_params.page_size * chip_params.pages_per_block;
+	else
+		errx(1, "Cannot ioctl(NAND_IO_GET_CHIP_PARAM)");
 
 	debug("erasesize: %#jx", (uintmax_t)erasesize);