diff --git a/[refs] b/[refs] index fc26662774ac..f2b5025bd69a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0c041cb6f74f9734d9a3af1061a718b3879a255 +refs/heads/master: b645d79619e8b15e91cc7df23c5f8a23d0d69377 diff --git a/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index 467c9a18819b..7668388e8b56 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/sound/pci/hda/patch_ca0132.c @@ -1054,7 +1054,7 @@ static void chipio_enable_clocks(struct hda_codec *codec) static int dspio_send(struct hda_codec *codec, unsigned int reg, unsigned int data) { - unsigned int res; + int res; int retry = 50; /* send bits of data specified by reg to dsp */