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

Commit 7b5362a6 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

w1: omap_hdq: Fix some error/debug handling. 



- some debug messages missed spaces
- sometimes no error was returned when it should have been
- sometimes a message is printed when there is no error, rather
  than when there is one.

Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd0aa67c

drivers/w1/masters/omap_hdq.c

+8 −7
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status) 
		hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT);

	if (ret == 0) {

		dev_dbg(hdq_data->dev, "TX wait elapsed\n");

		ret = -ETIMEDOUT;

		goto out;

	}
@@ -396,7 +397,7 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val) 
out:

	mutex_unlock(&hdq_data->hdq_mutex);

rtn:

	return 0;

	return ret;



}
@@ -540,7 +541,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte) 
	mutex_unlock(&hdq_data->hdq_mutex);



	ret = hdq_write_byte(hdq_data, byte, &status);

	if (ret == 0) {

	if (ret < 0) {

		dev_dbg(hdq_data->dev, "TX failure:Ctrl status %x\n", status);

		return;

	}