diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-19 22:31:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-19 22:31:14 +0200 |
| commit | 20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58 (patch) | |
| tree | 528c2f113e428e060e185ccab7eab8d8e87c7d36 /drivers/i2c/i2c-core.c | |
| parent | d14df339c72b6efbba4eddd1d1f3f4b173273f74 (diff) | |
| parent | 40f8989695660dee984338861ca9900b8e0b5183 (diff) | |
| download | linux-20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58.tar.gz linux-20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58.tar.bz2 linux-20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58.zip | |
Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand
out.
Diffstat (limited to 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 29d3f045a2bf..3be58f89ac77 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1134,6 +1134,9 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) acpi_handle handle; acpi_status status; + if (!adap->dev.parent) + return; + handle = ACPI_HANDLE(adap->dev.parent); if (!handle) return; |