diff --git a/[refs] b/[refs]
index 669fda71006e..47fd7b76f241 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489dc5cb18932d3cedaef03e84890475db17a843
+refs/heads/master: 0a4b2ccc555fa2ca6873d60219047104e4805d45
diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c
index eb37fba9b7ef..0521427a571e 100644
--- a/trunk/drivers/cpufreq/cpufreq.c
+++ b/trunk/drivers/cpufreq/cpufreq.c
@@ -826,13 +826,18 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
 	/* set up files for this cpu device */
 	drv_attr = cpufreq_driver->attr;
 	while ((drv_attr) && (*drv_attr)) {
-		sysfs_create_file(&policy->kobj, &((*drv_attr)->attr));
+		if (sysfs_create_file(&policy->kobj, &((*drv_attr)->attr)))
+			goto err_out_driver_exit;
 		drv_attr++;
 	}
-	if (cpufreq_driver->get)
-		sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr);
-	if (cpufreq_driver->target)
-		sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr);
+	if (cpufreq_driver->get){
+		if (sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr))
+			goto err_out_driver_exit;
+	}
+	if (cpufreq_driver->target){
+		if (sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr))
+			goto err_out_driver_exit;
+	}
 
 	spin_lock_irqsave(&cpufreq_driver_lock, flags);
 	for_each_cpu_mask(j, policy->cpus) {