]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: rt298: fix null deref on acpi driver data
authorVinod Koul <vinod.koul@intel.com>
Thu, 12 May 2016 04:08:49 +0000 (09:38 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 12 May 2016 14:25:58 +0000 (15:25 +0100)
ACPI driver data can be NULL so we need to check that before
dereference the driver data.

Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt298.c

index f0e6c06e89ac0448afd7580245353b12acbb3d4f..52aacb1d5e4cab2c1b1d788d40ae29a186d7c832 100644 (file)
@@ -1184,7 +1184,7 @@ static int rt298_i2c_probe(struct i2c_client *i2c,
 
        /* enable jack combo mode on supported devices */
        acpiid = acpi_match_device(dev->driver->acpi_match_table, dev);
-       if (acpiid) {
+       if (acpiid && acpiid->driver_data) {
                rt298->pdata = *(struct rt298_platform_data *)
                                acpiid->driver_data;
        }