Commit f18a9531 authored by Alexander Shishkin's avatar Alexander Shishkin

intel_th: Fix activating a subdevice without a driver

If output subdevice driver is not loaded, activating it will try to
call its ->activate method and crash. Fix this by explicitly checking
for the driver.
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: default avatarLaurent Fert <laurent.fert@intel.com>
parent e8644e4c
...@@ -183,7 +183,11 @@ static DEVICE_ATTR_RO(port); ...@@ -183,7 +183,11 @@ static DEVICE_ATTR_RO(port);
static int intel_th_output_activate(struct intel_th_device *thdev) static int intel_th_output_activate(struct intel_th_device *thdev)
{ {
struct intel_th_driver *thdrv = to_intel_th_driver(thdev->dev.driver); struct intel_th_driver *thdrv =
to_intel_th_driver_or_null(thdev->dev.driver);
if (!thdrv)
return -ENODEV;
if (thdrv->activate) if (thdrv->activate)
return thdrv->activate(thdev); return thdrv->activate(thdev);
...@@ -195,7 +199,11 @@ static int intel_th_output_activate(struct intel_th_device *thdev) ...@@ -195,7 +199,11 @@ static int intel_th_output_activate(struct intel_th_device *thdev)
static void intel_th_output_deactivate(struct intel_th_device *thdev) static void intel_th_output_deactivate(struct intel_th_device *thdev)
{ {
struct intel_th_driver *thdrv = to_intel_th_driver(thdev->dev.driver); struct intel_th_driver *thdrv =
to_intel_th_driver_or_null(thdev->dev.driver);
if (!thdrv)
return;
if (thdrv->deactivate) if (thdrv->deactivate)
thdrv->deactivate(thdev); thdrv->deactivate(thdev);
......
...@@ -151,6 +151,9 @@ struct intel_th_driver { ...@@ -151,6 +151,9 @@ struct intel_th_driver {
#define to_intel_th_driver(_d) \ #define to_intel_th_driver(_d) \
container_of((_d), struct intel_th_driver, driver) container_of((_d), struct intel_th_driver, driver)
#define to_intel_th_driver_or_null(_d) \
((_d) ? to_intel_th_driver(_d) : NULL)
static inline struct intel_th_device * static inline struct intel_th_device *
to_intel_th_hub(struct intel_th_device *thdev) to_intel_th_hub(struct intel_th_device *thdev)
{ {
......
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