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

Commit 0d480db8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

drivers/telephony/ixj: cleanup and fix gcc warning 



1) Fix gcc uninit'd var warnings by adding 'default' switch stmt labels
in two cases.  It was lightning-strikes unlikely that a problem would
ever arise, but not impossible.

2) Tighten the scope of 'blankword' in two cases.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 79c63e19

drivers/telephony/ixj.c

+6 −1
Original line number Diff line number Diff line
@@ -3453,7 +3453,6 @@ static void ixj_write_frame(IXJ *j) 
{

	int cnt, frame_count, dly;

	IXJ_WORD dat;

	BYTES blankword;



	frame_count = 0;

	if(j->flags.cidplay) {
@@ -3501,6 +3500,8 @@ static void ixj_write_frame(IXJ *j) 
		}

		if (frame_count >= 1) {

			if (j->ver.low == 0x12 && j->play_mode && j->flags.play_first_frame) {

				BYTES blankword;



				switch (j->play_mode) {

				case PLAYBACK_MODE_ULAW:

				case PLAYBACK_MODE_ALAW:
@@ -3508,6 +3509,7 @@ static void ixj_write_frame(IXJ *j) 
					break;

				case PLAYBACK_MODE_8LINEAR:

				case PLAYBACK_MODE_16LINEAR:

				default:

					blankword.low = blankword.high = 0x00;

					break;

				case PLAYBACK_MODE_8LINEAR_WSS:
@@ -3531,6 +3533,8 @@ static void ixj_write_frame(IXJ *j) 
				j->flags.play_first_frame = 0;

			} else	if (j->play_codec == G723_63 && j->flags.play_first_frame) {

				for (cnt = 0; cnt < 24; cnt++) {

					BYTES blankword;



					if(cnt == 12) {

						blankword.low = 0x02;

						blankword.high = 0x00;
@@ -4868,6 +4872,7 @@ static char daa_CR_read(IXJ *j, int cr) 
		bytes.high = 0xB0 + cr;

		break;

	case SOP_PU_PULSEDIALING:

	default:

		bytes.high = 0xF0 + cr;

		break;

	}