Bug fixes:

Replace release function: cros_ec_dev
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAlwHo1gACgkQUa+KL4f8
 d2HhMg/9F1t9f7kDVbHHLIXTB7ecnS0FfMXuA18dieYwvxYX/wKIJQQkcaqBM1Ev
 IbJ4mAGAmtwOPTa8dMy4PZswZ1gsB0al64JX8QQF87RwOWIwVhRdLuorILsKXQNy
 LTP87hWeTGmJCCs7IVjAZIYtCY/r0PkA9QhuZpqp44CK8WFxp3JbdDGg1L9MrgPk
 IFsHdJkj3A09HJYay0HuIDMDK4eu8FHSLOWz2EjSWdePkmvIOApxAJMV+36/aSNA
 C1KugSzJmj7uwtq1xC5hgGxMZrXODqUZQdtPDLLSkaEE99V6g5hTTNVGjmX2ohw6
 6OMyULHIP9oXHVg1XDnSfajev1J6mhfir7OyNuuW52JrEmr1RpY1+Dn/Yor/gIno
 RnDR0CvnoJHrCbmJGxEFmlNWBc1y0s6tct3SuXxBLAHZOtF3OZ6OCb52/BeuQhH6
 U78/pJOnZ2BZs7IXh0HjEds5gzRZ3Um7+4lqCcBq/CHOxRk7R30CfH/4IDcjkTtT
 lIgKqoDFZatY8Am3ZcimzmNsyCnE8C/9+lsSMW2YupU10tkaFQHM0Szio6JYuHcI
 uayio9NBXTPxEIogezsSrd1umSH+MYaEpxcVjZ74BsVw8o0ZP8p+kEb+SXP9ahAx
 r00PHpgTPYsXG4ZjeCoFbzuE1tdDy/66gVE57S9P6ChqvGIt0Uo=
 =Brl7
 -----END PGP SIGNATURE-----

Merge tag 'mfd-fixes-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull mfd bugfix from Lee Jones:
 "Replace release function in cros_ec_dev"

* tag 'mfd-fixes-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  Revert "mfd: cros_ec: Use devm_kzalloc for private data"
This commit is contained in:
Linus Torvalds 2018-12-05 09:45:34 -08:00
commit 5e0dc1a7ce

View File

@ -263,6 +263,11 @@ static const struct file_operations fops = {
#endif
};
static void cros_ec_class_release(struct device *dev)
{
kfree(to_cros_ec_dev(dev));
}
static void cros_ec_sensors_register(struct cros_ec_dev *ec)
{
/*
@ -395,7 +400,7 @@ static int ec_device_probe(struct platform_device *pdev)
int retval = -ENOMEM;
struct device *dev = &pdev->dev;
struct cros_ec_platform *ec_platform = dev_get_platdata(dev);
struct cros_ec_dev *ec = devm_kzalloc(dev, sizeof(*ec), GFP_KERNEL);
struct cros_ec_dev *ec = kzalloc(sizeof(*ec), GFP_KERNEL);
if (!ec)
return retval;
@ -417,6 +422,7 @@ static int ec_device_probe(struct platform_device *pdev)
ec->class_dev.devt = MKDEV(ec_major, pdev->id);
ec->class_dev.class = &cros_class;
ec->class_dev.parent = dev;
ec->class_dev.release = cros_ec_class_release;
retval = dev_set_name(&ec->class_dev, "%s", ec_platform->ec_name);
if (retval) {