|
@@ -525,16 +525,25 @@ static int applesmc_init_smcreg_try(void)
|
|
|
{
|
|
|
struct applesmc_registers *s = &smcreg;
|
|
|
bool left_light_sensor, right_light_sensor;
|
|
|
+ unsigned int count;
|
|
|
u8 tmp[1];
|
|
|
int ret;
|
|
|
|
|
|
if (s->init_complete)
|
|
|
return 0;
|
|
|
|
|
|
- ret = read_register_count(&s->key_count);
|
|
|
+ ret = read_register_count(&count);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
+ if (s->cache && s->key_count != count) {
|
|
|
+ pr_warn("key count changed from %d to %d\n",
|
|
|
+ s->key_count, count);
|
|
|
+ kfree(s->cache);
|
|
|
+ s->cache = NULL;
|
|
|
+ }
|
|
|
+ s->key_count = count;
|
|
|
+
|
|
|
if (!s->cache)
|
|
|
s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
|
|
|
if (!s->cache)
|