diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-22 19:02:41 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-24 00:08:16 +0100 |
commit | d826681ffd4cab8b54b524bc369e26e986c7d8c2 (patch) | |
tree | 5dc598cbdeed1f78c9da9d49af9db40ce3660116 | |
parent | 50ad56a5154a159f316fab54563bc3852e6f7ce7 (diff) |
patches: remove access to fwnode member in struct device
The firmware device node was added to struct device in ce793486e
"driver core / ACPI: Represent ACPI companions using fwnode_handle" do
not access it on older kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | patches/collateral-evolutions/media/0007-no-fwnode/v4l2.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/media/0007-no-fwnode/v4l2.patch b/patches/collateral-evolutions/media/0007-no-fwnode/v4l2.patch new file mode 100644 index 00000000..15357494 --- /dev/null +++ b/patches/collateral-evolutions/media/0007-no-fwnode/v4l2.patch @@ -0,0 +1,26 @@ +--- a/drivers/media/v4l2-core/v4l2-device.c ++++ b/drivers/media/v4l2-core/v4l2-device.c +@@ -131,7 +131,11 @@ void v4l2_device_unregister(struct v4l2_ + * re-created by just probing the V4L2 driver. + */ + if (client && ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) + !client->dev.of_node && !client->dev.fwnode) ++#else ++ !client->dev.of_node) ++#endif + i2c_unregister_device(client); + continue; + } +@@ -140,7 +144,11 @@ void v4l2_device_unregister(struct v4l2_ + if (sd->flags & V4L2_SUBDEV_FL_IS_SPI) { + struct spi_device *spi = v4l2_get_subdevdata(sd); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) + if (spi && !spi->dev.of_node && !spi->dev.fwnode) ++#else ++ if (spi && !spi->dev.of_node) ++#endif + spi_unregister_device(spi); + continue; + } |