From: sungmin ha <sungmin82.ha@samsung.com>
Date: Thu, 13 Dec 2012 10:38:26 +0000 (+0900)
Subject: modified maru usb, jack and power supply for removing sonar violations
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=375f72879b64380f2a6b6277a3e00038cb7ef1e4;p=sdk%2Femulator%2Femulator-kernel.git

modified maru usb, jack and power supply for removing sonar violations
---

diff --git a/drivers/maru/maru_jack.c b/drivers/maru/maru_jack.c
index 11a77444f705..6f4526e3e146 100644
--- a/drivers/maru/maru_jack.c
+++ b/drivers/maru/maru_jack.c
@@ -198,7 +198,8 @@ static int __init sysfs_test_init(void)
 	if (!data) {
 		printk("[%s] kzalloc error\n", __FUNCTION__);
 		err = -ENOMEM;
-		goto alloc_err;
+		platform_device_unregister(&the_pdev);
+        	return err;
 	}
 
 	dev_set_drvdata(&the_pdev.dev, (void*)data);
@@ -206,17 +207,10 @@ static int __init sysfs_test_init(void)
 	err = sysfs_test_create_file(&the_pdev.dev);
 	if (err) {
 		printk("sysfs_create_file error\n");
-		goto sysfs_err;
+		kfree(data);
 	}
 
 	return 0;
-
-sysfs_err:
-	kfree(data);
-
-alloc_err:
-	platform_device_unregister(&the_pdev);
-	return err;
 }
 
 static void __exit sysfs_test_exit(void) 
diff --git a/drivers/maru/maru_power_supply.c b/drivers/maru/maru_power_supply.c
index b72dd331524c..13e15c98ae79 100644
--- a/drivers/maru/maru_power_supply.c
+++ b/drivers/maru/maru_power_supply.c
@@ -99,16 +99,23 @@ struct device new_device_dev;
 
 static int __init sysfs_test_init(void) 
 {
-	int err;
+	int err, i;
 	printk("[%s] \n", __FUNCTION__);
 
 	mtd_class = class_create(THIS_MODULE, "power_supply");
 	mtd_device = device_create(mtd_class, NULL, (dev_t)NULL, NULL, "battery");
 	
-	err = device_create_file(mtd_device, &ps_device_attributes[0]);
-	err = device_create_file(mtd_device, &ps_device_attributes[1]);
-	err = device_create_file(mtd_device, &ps_device_attributes[2]);
-
+	for (i = 0; i < 3; i++) {
+		err = device_create_file(mtd_device, &ps_device_attributes[i]);
+		if (err) {
+			while (--i >= 0)
+				device_remove_file(mtd_device, &ps_device_attributes[i]);
+		
+			device_unregister(mtd_device);
+			return err;
+		}
+	}
+	
 	return 0;
 }
 
diff --git a/drivers/maru/maru_usb_mass_storage.c b/drivers/maru/maru_usb_mass_storage.c
index d3aaee722c42..45657848fb92 100644
--- a/drivers/maru/maru_usb_mass_storage.c
+++ b/drivers/maru/maru_usb_mass_storage.c
@@ -190,7 +190,8 @@ static int __init sysfs_test_init(void)
 	if (!data) {
 		printk("[%s] kzalloc error\n", __FUNCTION__);
 		err = -ENOMEM;
-		goto alloc_err;
+		platform_device_unregister(&the_pdev);
+        	return err;
 	}
 
 	dev_set_drvdata(&the_pdev.dev, (void*)data);
@@ -200,23 +201,16 @@ static int __init sysfs_test_init(void)
 	err = sysfs_lun0_create_file(&the_pdev_sub1.dev);
 	if (err) {
 		printk("sysfs_create_file error\n");
-		goto sysfs_err;
+		kfree(data);
 	}
 	
 	err = sysfs_lun1_create_file(&the_pdev_sub2.dev);
 	if (err) {
 		printk("sysfs_create_file error\n");
-		goto sysfs_err;
+		kfree(data);
 	}
-
+	
 	return 0;
-
-sysfs_err:
-	kfree(data);
-
-alloc_err:
-	platform_device_unregister(&the_pdev);
-	return err;
 }
 
 static void __exit sysfs_test_exit(void) 
diff --git a/drivers/maru/maru_usb_mode.c b/drivers/maru/maru_usb_mode.c
index a4c4fc517e27..6abf84c5cccc 100644
--- a/drivers/maru/maru_usb_mode.c
+++ b/drivers/maru/maru_usb_mode.c
@@ -103,7 +103,8 @@ static int __init sysfs_test_init(void)
 	if (!data) {
 		printk("[%s] kzalloc error\n", __FUNCTION__);
 		err = -ENOMEM;
-		goto alloc_err;
+		platform_device_unregister(&the_pdev);
+        	return err;
 	}
 
 	dev_set_drvdata(&the_pdev.dev, (void*)data);
@@ -111,17 +112,10 @@ static int __init sysfs_test_init(void)
 	err = sysfs_test_create_file(&the_pdev.dev);
 	if (err) {
 		printk("sysfs_create_file error\n");
-		goto sysfs_err;
+		kfree(data);
 	}
 
 	return 0;
-
-sysfs_err:
-	kfree(data);
-
-alloc_err:
-	platform_device_unregister(&the_pdev);
-	return err;
 }
 
 static void __exit sysfs_test_exit(void) 
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index be28137763a5..b4685e5d3186 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.4.6
+Version: 1.4.7
 Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
 Source: emulator-kernel