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

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

Merge "cnss2: Skip cnss probe failure if debugfs creation fails"

parents e1ace966 92c8fa14

drivers/net/wireless/cnss2/debug.c

+6 −6
Original line number Diff line number Diff line
@@ -879,12 +879,6 @@ static int cnss_create_debug_only_node(struct cnss_plat_data *plat_priv) 


	return 0;

}

#else

static int cnss_create_debug_only_node(struct cnss_plat_data *plat_priv)

{

	return 0;

}

#endif



int cnss_debugfs_create(struct cnss_plat_data *plat_priv)

{
@@ -910,6 +904,12 @@ int cnss_debugfs_create(struct cnss_plat_data *plat_priv) 
out:

	return ret;

}

#else

int cnss_debugfs_create(struct cnss_plat_data *plat_priv)

{

	return 0;

}

#endif



void cnss_debugfs_destroy(struct cnss_plat_data *plat_priv)

{

drivers/net/wireless/cnss2/main.c

+1 −4
Original line number Diff line number Diff line
@@ -2308,9 +2308,7 @@ static int cnss_probe(struct platform_device *plat_dev) 
	if (ret)

		goto deinit_event_work;



	ret = cnss_debugfs_create(plat_priv);

	if (ret)

		goto deinit_qmi;

	cnss_debugfs_create(plat_priv);



	ret = cnss_misc_init(plat_priv);

	if (ret)
@@ -2329,7 +2327,6 @@ static int cnss_probe(struct platform_device *plat_dev) 


destroy_debugfs:

	cnss_debugfs_destroy(plat_priv);

deinit_qmi:

	cnss_qmi_deinit(plat_priv);

deinit_event_work:

	cnss_event_work_deinit(plat_priv);