diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-22 14:28:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-22 14:28:31 -0800 |
| commit | 82d939ecf0469f0af048724fdbca544f02baed7f (patch) | |
| tree | 8596e5b265fe4279c6afd9ca75f304aacac6d15f /drivers/staging/media/lirc/lirc_zilog.c | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| parent | 4f317748f2660cb62bcf43aac368aa42dbeb2b78 (diff) | |
Merge branch 'opw-next' into staging-next
This pulls in all of the staging patches applied during the opw
application process, and some other staging patches that were submitted
during that period of time. All of these are for 3.14-rc1.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/lirc/lirc_zilog.c')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_zilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 0feeaadf29dc..e1feb6164593 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c @@ -767,8 +767,8 @@ static int fw_load(struct IR_tx *tx) /* Request codeset data file */ ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev); if (ret != 0) { - zilog_error("firmware haup-ir-blaster.bin not available " - "(%d)\n", ret); + zilog_error("firmware haup-ir-blaster.bin not available (%d)\n", + ret); ret = ret < 0 ? ret : -EFAULT; goto out; } |