X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fcpuid.c;h=48e8e6558b26330061315a91dab13b2a7eb8380f;hb=5a943617ef52e9f79cd7cf437aad8870be27aabb;hp=ef6928418c8f90bc0120b1550307ef84a53afe9d;hpb=170a0bc3808909d8ea0f3f9c725c6565efe7f9c4;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index ef69284..48e8e65 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -116,18 +116,16 @@ static int cpuid_open(struct inode *inode, struct file *file)
 {
 	unsigned int cpu;
 	struct cpuinfo_x86 *c;
-	int ret = 0;
 
 	cpu = iminor(file->f_path.dentry->d_inode);
-	if (cpu >= nr_cpu_ids || !cpu_online(cpu)) {
-		ret = -ENXIO;	/* No such CPU */
-		goto out;
-	}
+	if (cpu >= nr_cpu_ids || !cpu_online(cpu))
+		return -ENXIO;	/* No such CPU */
+
 	c = &cpu_data(cpu);
 	if (c->cpuid_level < 0)
-		ret = -EIO;	/* CPUID not supported */
-out:
-	return ret;
+		return -EIO;	/* CPUID not supported */
+
+	return 0;
 }
 
 /*