patch-2.4.0-test7 linux/drivers/char/scan_keyb.c

• Lines: 44
• Date: Fri Aug 11 15:57:57 2000
• Orig file: v2.4.0-test6/linux/drivers/char/scan_keyb.c
• Orig date: Wed Aug 9 19:19:50 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/char/scan_keyb.c linux/drivers/char/scan_keyb.c
@@ -82,18 +82,21 @@
 {
 	struct scan_keyboard *kbd;
 
-	if((kbd=kmalloc(sizeof(struct scan_keyboard), GFP_KERNEL))==NULL)
+	kbd = kmalloc(sizeof(struct scan_keyboard), GFP_KERNEL);
+	if (kbd == NULL)
 		goto error_out;
 
 	kbd->scan=scan;
 	kbd->table=table;
 	kbd->length=length;
 
-	kbd->s0=kbd->s1=NULL;
-	if((kbd->s0=kmalloc(length, GFP_KERNEL))==NULL)
-		goto error_mem_free;
-	if((kbd->s1=kmalloc(length, GFP_KERNEL))==NULL)
-		goto error_mem_free;
+	kbd->s0 = kmalloc(length, GFP_KERNEL);
+	if (kbd->s0 == NULL)
+		goto error_free_kbd;
+
+	kbd->s1 = kmalloc(length, GFP_KERNEL);
+	if (kbd->s1 == NULL)
+		goto error_free_s0;
 
 	kbd->scan(kbd->s0);
 	kbd->scan(kbd->s1);
@@ -103,11 +106,10 @@
 
 	return 0;
 
- error_mem_free:
-	if(kbd->s0)
-		kfree(kbd->s0);
-	if(kbd->s1)
-		kfree(kbd->s1);
+ error_free_s0:
+	kfree(kbd->s0);
+
+ error_free_kbd:
 	kfree(kbd);
 
  error_out: