github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Reset controller changes for v4.11, part 2

Browse Source 
- Fix missing NULL check in reset_control_put for optional reset control
   conversion
 - Make zx2967 driver explicitly non-modular
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEBsBxhV1FaKwXuCOBUMKIHHCeYOsFAliTbCwXHHAuemFiZWxA
 cGVuZ3V0cm9uaXguZGUACgkQUMKIHHCeYOs2VBAAwEXhypAzCYTHXa9ky2eb3hfE
 4IiybwfXJUtueLQ/FlkdUAudf6euTqBXFA13LR4glVwyOWEh2uocywN7Ez8ZKtEi
 1uEjHansuEd2l5gUzV6VK0K4EtMsbHRKCcsZM75Q7x6oiRYBTqZaEmvZ8q2apSGR
 F+stu7Hrlbr1/s9Qe1iOIISlZT39RW7hNAcIoHLi3EVZh0fzrIKOLx/sK9lNHXMH
 DNnubpbV4NOymXG97E05ayxdxtLEPXhOFC4sWfDphukf4eHcRGLZz5Bpu2ZDm5S5
 NIOtSFoAKNI0fvpr45K8ougSOCmDt3FNq4bxUd6eDL3z1weMlYvaMFQSg3TcAloi
 09L8fFDZraAJmFTZsoE5of2ibP86RoIsb5jwyCSrT1Vvf3Hb0gdRNajAxg1gkyI5
 zi1vkv8IgQSQ37+ko70ioTzL2FxoPpLIMICTr4AyCYVdC5jjto0c7lpp5IvlUs/C
 Yd9W+1tEgL7GbF/yXoiqabXHcfyZVYTj6sgfImQSj3gUlyAzHKnwCmDcYQELTPeO
 jFmQyUBUjA8pNQl8iSjLKLXexTrqnDfEMtBRCTFUsvooOnohx/6be4eu3c3VkaZo
 rQ3jvjyo3++xFeK1xe/v1iUA77Z2sjHlip3kp4NF1n9t41xJfEhxHH94E0S8cSkY
 FY4BQBhTZSv4VzIU0AU=
 =/UJU
 -----END PGP SIGNATURE-----

Merge tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux into next/drivers

Pull "Reset controller changes for v4.11, part 2" from Philipp Zabel:

- Fix missing NULL check in reset_control_put for optional reset control
  conversion
- Make zx2967 driver explicitly non-modular

* tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux:
  reset: make zx2967 explicitly non-modular
  reset: core: fix reset_control_put
This commit is contained in:
Arnd Bergmann 2017-02-07 17:18:29 +01:00
commit 57ac490466
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/reset/core.c
View File

@ -392,7 +392,7 @@ EXPORT_SYMBOL_GPL(__of_reset_control_get);
void reset_control_put(struct reset_control *rstc)
{
if (IS_ERR(rstc))
if (IS_ERR_OR_NULL(rstc))
return;
mutex_lock(&reset_list_mutex);

7
drivers/reset/reset-zx2967.c
View File

@ -8,7 +8,6 @@
* License terms: GNU General Public License (GPL) version 2
*/
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/reset-controller.h>
@ -89,7 +88,6 @@ static const struct of_device_id zx2967_reset_dt_ids[] = {
{ .compatible = "zte,zx296718-reset", },
{},
};
MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids);
static struct platform_driver zx2967_reset_driver = {
.probe = zx2967_reset_probe,
@ -98,9 +96,4 @@ static struct platform_driver zx2967_reset_driver = {
.of_match_table = zx2967_reset_dt_ids,
},
};
builtin_platform_driver(zx2967_reset_driver);
MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver");
MODULE_LICENSE("GPL");