A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'linus' into core/percpu

Browse source 
Conflicts:
	arch/x86/kernel/setup_percpu.c
This commit is contained in:
Ingo Molnar 2009-01-27 12:01:51 +01:00
commit 3ddeb51d9c
944 changed files with 12533 additions and 5854 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/firmware/dell_rbu.c
View file

@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struct kobject *kobj,
{
int size = 0;
if (!pos)
size = sprintf(buffer, "%s\n", image_type);
size = scnprintf(buffer, count, "%s\n", image_type);
return size;
}
@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj,
int size = 0;
if (!pos) {
spin_lock(&rbu_data.lock);
size = sprintf(buffer, "%lu\n", rbu_data.packetsize);
size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize);
spin_unlock(&rbu_data.lock);
}
return size;