1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index ddeb819c8f87..f285f441fab9 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -217,8 +217,10 @@ firmware_data_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                 ret_count = -ENODEV;
                 goto out;
         }
-        if (offset > fw->size)
-                return 0;
+        if (offset > fw->size) {
+                ret_count = 0;
+                goto out;
+        }
         if (count > fw->size - offset)
                 count = fw->size - offset;
 
@@ -357,7 +359,7 @@ static void fw_dev_release(struct device *dev)
         kfree(fw_priv->pages);
         kfree(fw_priv->fw_id);
         kfree(fw_priv);
-        put_device(dev);
+        kfree(dev);
 
         module_put(THIS_MODULE);
 }
@@ -408,13 +410,11 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
         if (retval) {
                 dev_err(device, "%s: device_register failed\n", __func__);
                 put_device(f_dev);
-                goto error_kfree_fw_id;
+                return retval;
         }
         *dev_p = f_dev;
         return 0;
 
-error_kfree_fw_id:
-        kfree(fw_priv->fw_id);
 error_kfree:
         kfree(f_dev);
         kfree(fw_priv);