From 58195cd9e44265a6db0939c2c5453b088eabd869 Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Sat, 28 Nov 2015 21:26:07 +0100 Subject: [PATCH] facetimehd: Rename firmware directory And the v4l driver name. --- fthd_isp.c | 20 ++++++++++---------- fthd_v4l2.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fthd_isp.c b/fthd_isp.c index 3f67b5d..f36addc 100644 --- a/fthd_isp.c +++ b/fthd_isp.c @@ -147,7 +147,7 @@ static int isp_load_firmware(struct fthd_private *dev_priv) const struct firmware *fw; int ret = 0; - ret = request_firmware(&fw, "bcwc/firmware.bin", &dev_priv->pdev->dev); + ret = request_firmware(&fw, "facetimehd/firmware.bin", &dev_priv->pdev->dev); if (ret) return ret; @@ -465,40 +465,40 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv) switch(dev_priv->sensor_id1) { case 0x164: - filename = "bcwc/8221_01XX.dat"; + filename = "facetimehd/8221_01XX.dat"; break; case 0x190: - filename = "bcwc/1222_01XX.dat"; + filename = "facetimehd/1222_01XX.dat"; break; case 0x8830: - filename = "bcwc/9112_01XX.dat"; + filename = "facetimehd/9112_01XX.dat"; break; case 0x9770: if (vendor && board && !strcmp(vendor, "Apple Inc.") && !strncmp(board, "MacBookAir", sizeof("MacBookAir")-1)) { - filename = "bcwc/1771_01XX.dat"; + filename = "facetimehd/1771_01XX.dat"; break; } switch(dev_priv->sensor_id0) { case 4: - filename = "bcwc/1874_01XX.dat"; + filename = "facetimehd/1874_01XX.dat"; break; default: - filename = "bcwc/1871_01XX.dat"; + filename = "facetimehd/1871_01XX.dat"; break; } break; case 0x9774: switch(dev_priv->sensor_id0) { case 4: - filename = "bcwc/1674_01XX.dat"; + filename = "facetimehd/1674_01XX.dat"; break; case 5: - filename = "bcwc/1675_01XX.dat"; + filename = "facetimehd/1675_01XX.dat"; break; default: - filename = "bcwc/1671_01XX.dat"; + filename = "facetimehd/1671_01XX.dat"; break; } break; diff --git a/fthd_v4l2.c b/fthd_v4l2.c index a1ae8c6..b92f6cb 100644 --- a/fthd_v4l2.c +++ b/fthd_v4l2.c @@ -390,7 +390,7 @@ static int fthd_v4l2_ioctl_querycap(struct file *filp, void *priv, { struct fthd_private *dev_priv = video_drvdata(filp); - strcpy(cap->driver, "bcwc"); + strcpy(cap->driver, "facetimehd"); strcpy(cap->card, "Apple Facetime HD"); snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", pci_name(dev_priv->pdev));