diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-03 10:48:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-03 10:48:24 -0500 |
| commit | ae4806a38bc8db0b48e746445c41afd249568d68 (patch) | |
| tree | f7c3f8c079690fdbdec063335620303fa9eec585 /drivers/i2c/i2c-boardinfo.c | |
| parent | 49a418d78378769cf78b8c645f7e469f4dae2bbd (diff) | |
| parent | edef30980dc06bea547baefcfc8d910682b6e060 (diff) | |
| download | blackbird-op-linux-ae4806a38bc8db0b48e746445c41afd249568d68.tar.gz blackbird-op-linux-ae4806a38bc8db0b48e746445c41afd249568d68.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here are two bugfixes for I2C, fixing a memleak in the core and irq
allocation for i801.
Also three bugfixes for the at24 eeprom driver which Bartosz collected
while taking over maintainership for this driver"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
eeprom: at24: check at24_read/write arguments
eeprom: at24: fix reading from 24MAC402/24MAC602
eeprom: at24: correctly set the size for at24mac402
i2c: i2c-boardinfo: fix memory leaks on devinfo
i2c: i801: Fix Failed to allocate irq -2147483648 error
Diffstat (limited to 'drivers/i2c/i2c-boardinfo.c')
| -rw-r--r-- | drivers/i2c/i2c-boardinfo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c index 31186ead5a40..509a6007cdf6 100644 --- a/drivers/i2c/i2c-boardinfo.c +++ b/drivers/i2c/i2c-boardinfo.c @@ -86,6 +86,7 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig property_entries_dup(info->properties); if (IS_ERR(devinfo->board_info.properties)) { status = PTR_ERR(devinfo->board_info.properties); + kfree(devinfo); break; } } @@ -98,6 +99,7 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig GFP_KERNEL); if (!devinfo->board_info.resources) { status = -ENOMEM; + kfree(devinfo); break; } } |
