Merge "soc: soundwire: check for valid pointer before dereference"

This commit is contained in:
qctecmdr 2019-06-17 20:14:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit 189f783aa9

View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@ -998,10 +998,14 @@ static int swr_device_match(struct device *dev, struct device_driver *driver)
if (!drv)
return -EINVAL;
if (dev->type == &swr_dev_type)
if (dev->type == &swr_dev_type) {
swr_dev = to_swr_device(dev);
else
if (!swr_dev)
return -EINVAL;
} else {
return 0;
}
if (drv->id_table)
return swr_match(drv->id_table, swr_dev) != NULL;