Merge branch 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux into drm...

[firefly-linux-kernel-4.4.55.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index a31d91d9bc5a33d70388b0063e1d80c41383c125..7d5c3b20af451a111834efbabbdd83269085f123 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -64,7 +64,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
                        part = add_partition(disk, partno, start, length,
                                             ADDPART_FLAG_NONE, NULL);
                        mutex_unlock(&bdev->bd_mutex);
-                       return IS_ERR(part) ? PTR_ERR(part) : 0;
+                       return PTR_ERR_OR_ZERO(part);
                case BLKPG_DEL_PARTITION:
                        part = disk_get_part(disk, partno);
                        if (!part)