Merge branch 'ieee802154-for-davem-2019-08-24' of... (12e2e15d) · Commits · 戴 / test

drivers/net/ieee802154/mac802154_hwsim.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -802,7 +802,7 @@ static int hwsim_add_one(struct genl_info info, struct device dev,
		err = hwsim_subscribe_all_others(phy);
		if (err < 0) {
		mutex_unlock(&hwsim_phys_lock);
		goto err_reg;
		goto err_subscribe;
		}
		}
		list_add_tail(&phy->list, &hwsim_phys);
		@@ -812,6 +812,8 @@ static int hwsim_add_one(struct genl_info info, struct device dev,

		return idx;

		err_subscribe:
		ieee802154_unregister_hw(phy->hw);
		err_reg:
		kfree(pib);
		err_pib:
		@@ -901,9 +903,9 @@ static __init int hwsim_init_module(void)
		return 0;

		platform_drv:
		genl_unregister_family(&hwsim_genl_family);
		platform_dev:
		platform_device_unregister(mac802154hwsim_dev);
		platform_dev:
		genl_unregister_family(&hwsim_genl_family);
		return rc;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1092,7 +1092,7 @@ static struct packet_type ieee802154_packet_type = {

		static int __init af_ieee802154_init(void)
		{
		int rc = -EINVAL;
		int rc;

		rc = proto_register(&ieee802154_raw_prot, 1);
		if (rc)