Merge "Slim_ngd: Don't create the device node per SSR" (2a9b24f2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/slimbus/slim-msm-ngd.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1140,6 +1140,7 @@ static int ngd_notify_slaves(void *data)
		wait_for_completion(&dev->qmi.slave_notify);
		/* Probe devices for first notification */
		if (!i) {
		i++;
		dev->err = 0;
		if (dev->dev->of_node)
		of_register_slim_devices(&dev->ctrl);
		@@ -1152,12 +1153,12 @@ static int ngd_notify_slaves(void *data)
		} else {
		slim_framer_booted(ctrl);
		}
		i++;
		mutex_lock(&ctrl->m_ctrl);
		list_for_each_safe(pos, next, &ctrl->devs) {
		int j;
		sbdev = list_entry(pos, struct slim_device, dev_list);
		mutex_unlock(&ctrl->m_ctrl);
		for (i = 0; i < LADDR_RETRY; i++) {
		for (j = 0; j < LADDR_RETRY; j++) {
		ret = slim_get_logical_addr(sbdev,
		sbdev->e_addr,
		6, &sbdev->laddr);