X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fioctl.c;h=7d5c3b20af451a111834efbabbdd83269085f123;hb=14a0d635d18d0fb552dcc979d6d25106e6541f2e;hp=a31d91d9bc5a33d70388b0063e1d80c41383c125;hpb=ec05a2311c35243cea08bca00bcf53a576ee41a2;p=~andy%2Flinux

diff --git a/block/ioctl.c b/block/ioctl.c
index a31d91d9bc5..7d5c3b20af4 100644
--- 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)