Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf472a94 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sps: correct compilation errors" into msm-4.8

parents 907385d0 8166292d

drivers/platform/msm/sps/sps.c

+1 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ int sps_register_bam_device(const struct sps_bam_props *bam_props, 
	bam = kzalloc(sizeof(*bam), GFP_KERNEL);

	if (bam == NULL) {

		SPS_ERR(sps,

			"sps:Unable to allocate BAM device state: size is %d",

			"sps:Unable to allocate BAM device state: size is %zu",

			sizeof(*bam));

		goto exit_err;

	}

drivers/platform/msm/sps/spsi.h

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ void print_bam_reg(void *virt_addr); 
void print_bam_pipe_reg(void *virt_addr, u32 pipe_index);



/* output the content of selected BAM-level registers */

void print_bam_pipe_reg(void *virt_addr, u32 pipe_index);

void print_bam_selected_reg(void *virt_addr, u32 pipe_index);



/* output the content of selected BAM pipe registers */

void print_bam_pipe_selected_reg(void *virt_addr, u32 pipe_index);