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

Commit 8d7cb7ba authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi: core: Return error on failure to get tsync time"

parents 45e958b8 84986630

drivers/bus/mhi/core/mhi_init.c

+3 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */



#include <asm/arch_timer.h>

#include <linux/debugfs.h>
@@ -131,8 +131,7 @@ static ssize_t time_show(struct device *dev, 
	ret = mhi_get_remote_time_sync(mhi_dev, &t_host, &t_device);

	if (ret) {

		MHI_ERR("Failed to obtain time, ret:%d\n", ret);

		return scnprintf(buf, PAGE_SIZE,

				 "Request failed or feature unsupported\n");

		return ret;

	}



	return scnprintf(buf, PAGE_SIZE, "local: %llu remote: %llu (ticks)\n",
@@ -152,8 +151,7 @@ static ssize_t time_us_show(struct device *dev, 
	ret = mhi_get_remote_time_sync(mhi_dev, &t_host, &t_device);

	if (ret) {

		MHI_ERR("Failed to obtain time, ret:%d\n", ret);

		return scnprintf(buf, PAGE_SIZE,

				 "Request failed or feature unsupported\n");

		return ret;

	}



	return scnprintf(buf, PAGE_SIZE, "local: %llu remote: %llu (us)\n",