Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-5
+10
-5
drivers/i2c/i2c-core-base.c
+10
-5
drivers/i2c/i2c-core-base.c
···
2506
2506
static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
2507
2507
{
2508
2508
const unsigned short *address_list;
2509
-
struct i2c_client temp_client;
2509
+
struct i2c_client *temp_client;
2510
2510
int i, err = 0;
2511
2511
2512
2512
address_list = driver->address_list;
···
2527
2527
return 0;
2528
2528
2529
2529
/* Set up a temporary client to help detect callback */
2530
-
memset(&temp_client, 0, sizeof(temp_client));
2531
-
temp_client.adapter = adapter;
2530
+
temp_client = kzalloc(sizeof(*temp_client), GFP_KERNEL);
2531
+
if (!temp_client)
2532
+
return -ENOMEM;
2533
+
2534
+
temp_client->adapter = adapter;
2532
2535
2533
2536
for (i = 0; address_list[i] != I2C_CLIENT_END; i += 1) {
2534
2537
dev_dbg(&adapter->dev,
2535
2538
"found normal entry for adapter %d, addr 0x%02x\n",
2536
2539
i2c_adapter_id(adapter), address_list[i]);
2537
-
temp_client.addr = address_list[i];
2538
-
err = i2c_detect_address(&temp_client, driver);
2540
+
temp_client->addr = address_list[i];
2541
+
err = i2c_detect_address(temp_client, driver);
2539
2542
if (unlikely(err))
2540
2543
break;
2541
2544
}
2545
+
2546
+
kfree(temp_client);
2542
2547
2543
2548
return err;
2544
2549
}