From 61d6f23375e0e7233b3bd851eae1baf963f40183 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 30 Sep 2011 07:56:02 -0300 Subject: [PATCH] --- yaml --- r: 273718 b: refs/heads/master c: 57f6217be1d129e3e38bac3eadc20cbf909666b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb5119fb1bf9..467f6bf976a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f524ec156ba31a18425fad9dd1287be0701d9d1 +refs/heads/master: 57f6217be1d129e3e38bac3eadc20cbf909666b6 diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c index 5f4da80051bb..f2481a85e0a2 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c +++ b/trunk/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;