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

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

Merge "diag: Prevent possible deadlock while memory device session runs"

parents 74390d4b 8ad40fe7

drivers/char/diag/diagfwd.c

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

// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.

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

 */

 */

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/init.h>

#include <linux/init.h>
@@ -1378,8 +1378,8 @@ int diag_process_apps_pkt(unsigned char *buf, int len, int pid) 
			}

			}

		}

		}

		mutex_unlock(&driver->md_session_lock);

		mutex_unlock(&driver->md_session_lock);

		diag_update_md_clients(HDLC_SUPPORT_TYPE);

		mutex_unlock(&driver->hdlc_disable_mutex);

		mutex_unlock(&driver->hdlc_disable_mutex);

		diag_update_md_clients(HDLC_SUPPORT_TYPE);

		return 0;

		return 0;

	}

	}

#endif

#endif