summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-mfc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2011-09-30 12:56:02 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 21:29:14 +0100
commit57f6217be1d129e3e38bac3eadc20cbf909666b6 (patch)
tree609587ba627536c7272d05eb7ebb3edcdd835bea /drivers/media/video/s5p-mfc
parent[media] vb2: add vb2_get_unmapped_area in vb2 core (diff)
downloadlinux-57f6217be1d129e3e38bac3eadc20cbf909666b6.tar.xz
linux-57f6217be1d129e3e38bac3eadc20cbf909666b6.zip
[media] MFC: Change MFC firmware binary name
This patch renames the MFC firmware binary to avoid SoC name in it. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-mfc')
-rw-r--r--drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
index 5f4da80051bb..f2481a85e0a2 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
@@ -38,7 +38,7 @@ int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev *dev)
* into kernel. */
mfc_debug_enter();
err = request_firmware((const struct firmware **)&fw_blob,
- "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+ "s5p-mfc.fw", dev->v4l2_dev.dev);
if (err != 0) {
mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
return -EINVAL;
@@ -116,7 +116,7 @@ int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev)
* into kernel. */
mfc_debug_enter();
err = request_firmware((const struct firmware **)&fw_blob,
- "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+ "s5p-mfc.fw", dev->v4l2_dev.dev);
if (err != 0) {
mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
return -EINVAL;