mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'fix/misc' into topic/misc
This commit is contained in:
commit
0c3c35e148
1772 changed files with 89867 additions and 25724 deletions
|
|
@ -219,7 +219,9 @@ static int shared_resources_initialised;
|
|||
* Mid level stuff
|
||||
*/
|
||||
|
||||
struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
|
||||
struct sound_settings dmasound = {
|
||||
.lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
|
||||
};
|
||||
|
||||
static inline void sound_silence(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
|
|||
break;
|
||||
|
||||
default:
|
||||
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
|
||||
/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
|
||||
;
|
||||
}
|
||||
}
|
||||
|
|
@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
|
|||
break;
|
||||
|
||||
default:
|
||||
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
|
||||
/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
|
||||
;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
|
|||
break;
|
||||
|
||||
default:;
|
||||
/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
|
||||
/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue