Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a94877 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/fix/core' into regmap-linus

parents fe82dcec d6b41cb0

drivers/base/regmap/regmap.c

+5 −2
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ int _regmap_write(struct regmap *map, unsigned int reg, 
	}



#ifdef LOG_DEVICE

	if (strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

	if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

		dev_info(map->dev, "%x <= %x\n", reg, val);

#endif
@@ -1659,6 +1659,9 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
	} else {

		void *wval;



		if (!val_count)

			return -EINVAL;



		wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);

		if (!wval) {

			dev_err(map->dev, "Error in memory allocation\n");
@@ -2058,7 +2061,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg, 
	ret = map->reg_read(context, reg, val);

	if (ret == 0) {

#ifdef LOG_DEVICE

		if (strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

		if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)

			dev_info(map->dev, "%x => %x\n", reg, *val);

#endif