summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-10-18 22:39:50 +0900
committerTakashi Iwai <tiwai@suse.de>2015-10-19 11:57:01 +0200
commitcbc6f28067aa0aa1193c2bf3546430b2c4dae22c (patch)
treea382363ac119f22a3c61b1485b255f8a237d8d0b /sound/firewire
parent3e93d42a04eea4e621f87bfc51b0ab868e131cb9 (diff)
downloadlinux-stable-cbc6f28067aa0aa1193c2bf3546430b2c4dae22c.tar.gz
linux-stable-cbc6f28067aa0aa1193c2bf3546430b2c4dae22c.tar.bz2
linux-stable-cbc6f28067aa0aa1193c2bf3546430b2c4dae22c.zip
ALSA: dice: assign converted data to the same type of variable
In former commit, u32 data was assigned to __be32 variable instead of an int variable. This is not enough solution because it still causes sparse warnings. dice.c:80:23: warning: incorrect type in assignment (different base types) dice.c:80:23: expected restricted __be32 [usertype] value dice.c:80:23: got unsigned int dice.c:81:21: warning: restricted __be32 degrades to integer dice.c:81:46: warning: restricted __be32 degrades to integer This commit fixes this bug. Fixes: 7c2d4c0cf5ba('ALSA: dice: Split transaction functionality into a file') Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/dice/dice.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c
index 70a111d7f428..5d99436dfcae 100644
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
@@ -29,7 +29,8 @@ static int dice_interface_check(struct fw_unit *unit)
struct fw_csr_iterator it;
int key, val, vendor = -1, model = -1, err;
unsigned int category, i;
- __be32 *pointers, value;
+ __be32 *pointers;
+ u32 value;
__be32 version;
pointers = kmalloc_array(ARRAY_SIZE(min_values), sizeof(__be32),