Commit 2e31e6f8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab

media: atomisp: Make pointer to PMIC client global

When we enumerate second device when PMIC has been successfully detected
to AXP, we got into troubles dereferencing NULL pointer. It seems
we have to detect PMIC only once because pmic_id is a global variable
and code doesn't expect the change of it: Two PMICs on one platform?
It's impossible.

Crash excerpt:
[   34.335237] BUG: kernel NULL pointer dereference, address: 0000000000000002
...
[   35.652036] RIP: 0010:gmin_subdev_add.cold+0x32f/0x33e [atomisp_gmin_platform]

So, as a quick fix make power a global variable. In next patches we move
PMIC detection to be more independent from subdevices.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 0f46ab46
...@@ -482,9 +482,11 @@ static int atomisp_get_acpi_power(struct device *dev, acpi_handle handle) ...@@ -482,9 +482,11 @@ static int atomisp_get_acpi_power(struct device *dev, acpi_handle handle)
return clock_num; return clock_num;
} }
static struct i2c_client *power;
static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev) static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev)
{ {
struct i2c_client *power = NULL, *client = v4l2_get_subdevdata(subdev); struct i2c_client *client = v4l2_get_subdevdata(subdev);
struct acpi_device *adev; struct acpi_device *adev;
struct gmin_subdev *gs; struct gmin_subdev *gs;
acpi_handle handle; acpi_handle handle;
...@@ -696,7 +698,6 @@ static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev) ...@@ -696,7 +698,6 @@ static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev)
gs->eldo2_ctrl_shift = gmin_get_var_int(dev, false, gs->eldo2_ctrl_shift = gmin_get_var_int(dev, false,
"eldo2_ctrl_shift", "eldo2_ctrl_shift",
ELDO2_CTRL_SHIFT); ELDO2_CTRL_SHIFT);
gs->pwm_i2c_addr = power->addr;
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment