niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

i2c-for-6.14-rc4

Browse source 
Revert one cleanup which turned out to eat too much stack space
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAme7Du8ACgkQFA3kzBSg
 KbZ6Ng//a4NcW1e3JWjmCtIzO5J8flrewKbfy0PIGCYiylv5HIBC5TSPhX3JUHWj
 5JEPCujtEJlCD3r9EFq/yJPSTxKvO2lWGLu9jz9W9Lo9KzSH6pP6mWXTW7W+989w
 5ZU8H4pM2f5itHztcv/FJNJU+DNjBsutZcdATgGxxcllsDTA//jEHNORp5jOVNXF
 5A91h4FNAG4VMfTpgK/XrCTxWkJHo1LyhC5YZpSxPOqCo/ZXwtwc161QCpCYgKan
 XWc3pgAeG4PdFBNFB6jsG0RUFbOxO+pj/Ub9dDn4axDpkwFBl5ejMkw8aIC1oSW9
 P3wUVxUlrUaT7ceTqWYHy0uzq26R4zB6uJKhmFrRLMjVsd9MBPD4UkUTQuLYz0JH
 BFkeg8VP+0LLnSbJVKkZQRJRuuV/NQGgIlmiGBxedH0PiycDL3lRnX3xRjRBF3iR
 2jm1VMZ9zhmAgEZ8xFwwnD6LDqFi2Cr9/QOkOjh4QIgI80hVT/UUqCB+V+RrZLR9
 NN1ewPTrW1NVBAiz9gQw7zriPaDq5uqaKEDAUIzvPkkbc8F8xFUT70fMJHccNZaV
 +CrCqh7ApmDU4YVHIiuLxGvhXRdoV3XW+82ihwvad9AlXadPEWvWIUJTqZL3YYTI
 l8WqIJO2ZyH1/CSdt2e9DMav9Tp1MrMxB75wKqIaibXYdZB47L0=
 =TO6X
 -----END PGP SIGNATURE-----

Merge tag 'i2c-for-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fix from Wolfram Sang:
 "Revert one cleanup which turned out to eat too much stack space"

* tag 'i2c-for-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: Allocate temporary client dynamically
This commit is contained in:
Linus Torvalds 2025-02-23 10:37:18 -08:00
commit 9d68911233
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/i2c/i2c-core-base.c
View file

@ -2506,7 +2506,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
{
const unsigned short *address_list;
struct i2c_client temp_client;
struct i2c_client *temp_client;
int i, err = 0;
address_list = driver->address_list;
@ -2527,19 +2527,24 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
return 0;
/* Set up a temporary client to help detect callback */
memset(&temp_client, 0, sizeof(temp_client));
temp_client.adapter = adapter;
temp_client = kzalloc(sizeof(*temp_client), GFP_KERNEL);
if (!temp_client)
return -ENOMEM;
temp_client->adapter = adapter;
for (i = 0; address_list[i] != I2C_CLIENT_END; i += 1) {
dev_dbg(&adapter->dev,
"found normal entry for adapter %d, addr 0x%02x\n",
i2c_adapter_id(adapter), address_list[i]);
temp_client.addr = address_list[i];
err = i2c_detect_address(&temp_client, driver);
temp_client->addr = address_list[i];
err = i2c_detect_address(temp_client, driver);
if (unlikely(err))
break;
}
kfree(temp_client);
return err;
}