git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
sound
/
pci
/
hda
/
hda_hwdep.c
diff --git
a/sound/pci/hda/hda_hwdep.c
b/sound/pci/hda/hda_hwdep.c
index
72e5885
..
6b2efb8
100644
(file)
--- a/
sound/pci/hda/hda_hwdep.c
+++ b/
sound/pci/hda/hda_hwdep.c
@@
-26,6
+26,7
@@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/firmware.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/firmware.h>
+#include <linux/export.h>
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
@@
-756,8
+757,6
@@
static int get_line_from_fw(char *buf, int size, struct firmware *fw)
}
if (!fw->size)
return 0;
}
if (!fw->size)
return 0;
- if (size < fw->size)
- size = fw->size;
for (len = 0; len < fw->size; len++) {
if (!*p)
for (len = 0; len < fw->size; len++) {
if (!*p)