Merge "soundwire: Fix swr device count logic in registration" (aff876ea) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soundwire/soundwire.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -182,14 +182,15 @@ int of_register_swr_devices(struct swr_master *master)
		}
		info.addr = addr;
		info.of_node = of_node_get(node);
		master->num_dev++;
		swr = swr_new_device(master, &info);
		if (!swr) {
		dev_err(&master->dev, "of_swr: Register failed %s\n",
		node->full_name);
		of_node_put(node);
		master->num_dev--;
		continue;
		}
		master->num_dev++;
		}
		return 0;
		}