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

Commit 3aee0605 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: avoid radio controller reset loops
  uwb: stop uwbd thread if rc->start() fails
  uwb: handle radio controller events with out-of-range IDs correctly
parents f4c3f038 0396c215

drivers/uwb/hwa-rc.c

+1 −2
Original line number Diff line number Diff line
@@ -887,8 +887,7 @@ static int hwarc_post_reset(struct usb_interface *iface) 
	struct hwarc *hwarc = usb_get_intfdata(iface);

	struct uwb_rc *uwb_rc = hwarc->uwb_rc;



	uwb_rc_post_reset(uwb_rc);

	return 0;

	return uwb_rc_post_reset(uwb_rc);

}



/** USB device ID's that we handle */

drivers/uwb/lc-rc.c

+1 −1
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ int uwb_rc_add(struct uwb_rc *rc, struct device *parent_dev, void *priv) 
error_dev_add:

error_rc_setup:

	rc->stop(rc);

	uwbd_stop(rc);

error_rc_start:

	uwbd_stop(rc);

	return result;

}

EXPORT_SYMBOL_GPL(uwb_rc_add);

drivers/uwb/reset.c

+11 −10
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 */

#include <linux/kernel.h>

#include <linux/err.h>

#include <linux/delay.h>



#include "uwb-internal.h"
@@ -323,13 +324,15 @@ int uwbd_msg_handle_reset(struct uwb_event *evt) 


	dev_info(&rc->uwb_dev.dev, "resetting radio controller\n");

	ret = rc->reset(rc);

	if (ret) {

	if (ret < 0) {

		dev_err(&rc->uwb_dev.dev, "failed to reset hardware: %d\n", ret);

		goto error;

	}

	return 0;

error:

	/* Nothing can be done except try the reset again. */

	/* Nothing can be done except try the reset again. Wait a bit

	   to avoid reset loops during probe() or remove(). */

	msleep(1000);

	uwb_rc_reset_all(rc);

	return ret;

}
@@ -368,22 +371,20 @@ void uwb_rc_pre_reset(struct uwb_rc *rc) 
}

EXPORT_SYMBOL_GPL(uwb_rc_pre_reset);



void uwb_rc_post_reset(struct uwb_rc *rc)

int uwb_rc_post_reset(struct uwb_rc *rc)

{

	int ret;



	ret = rc->start(rc);

	if (ret)

		goto error;

		goto out;

	ret = uwb_rc_mac_addr_set(rc, &rc->uwb_dev.mac_addr);

	if (ret)

		goto error;

		goto out;

	ret = uwb_rc_dev_addr_set(rc, &rc->uwb_dev.dev_addr);

	if (ret)

		goto error;

	return;

error:

	/* Nothing can be done except try the reset again. */

	uwb_rc_reset_all(rc);

		goto out;

out:

	return ret;

}

EXPORT_SYMBOL_GPL(uwb_rc_post_reset);

drivers/uwb/umc-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int umc_controller_reset(struct umc_dev *umc) 
		return -EAGAIN;

	ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper);

	if (ret >= 0)

		device_for_each_child(parent, parent, umc_bus_post_reset_helper);

		ret = device_for_each_child(parent, parent, umc_bus_post_reset_helper);

	up(&parent->sem);



	return ret;

drivers/uwb/uwbd.c

+2 −2
Original line number Diff line number Diff line
@@ -187,12 +187,12 @@ int uwbd_event_handle_urc(struct uwb_event *evt) 
	event = le16_to_cpu(evt->notif.rceb->wEvent);

	context = evt->notif.rceb->bEventContext;



	if (type > ARRAY_SIZE(uwbd_urc_evt_type_handlers))

	if (type >= ARRAY_SIZE(uwbd_urc_evt_type_handlers))

		goto out;

	type_table = &uwbd_urc_evt_type_handlers[type];

	if (type_table->uwbd_events == NULL)

		goto out;

	if (event > type_table->size)

	if (event >= type_table->size)

		goto out;

	handler = type_table->uwbd_events[event].handler;

	if (handler == NULL)