diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-03-07 01:01:57 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-03-07 01:01:57 +0000 |
| commit | 4ac70c829cbf31c6e1ed2b2b91a33a0aa71a0319 (patch) | |
| tree | 86a879aabfa64bd4e6c11384b046dc6bb9fd71b3 /sbin | |
| parent | e8a3a237fc0431a74e913526e52657d065590165 (diff) | |
| download | src-4ac70c829cbf31c6e1ed2b2b91a33a0aa71a0319.tar.gz src-4ac70c829cbf31c6e1ed2b2b91a33a0aa71a0319.zip | |
Slight if reordering to make error branch last.
Notes
Notes:
svn path=/head/; revision=262880
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/newfs_nandfs/newfs_nandfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c index 5242318ab9fd..fda2b9ed01ef 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); |