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

Commit 93e33369 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

parents 5577070b 0a60e50f

drivers/android/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,18 @@ config ANDROID_BINDER_IPC 
	  Android process, using Binder to identify, invoke and pass arguments

	  between said processes.



config ANDROID_BINDER_DEVICES

	string "Android Binder devices"

	depends on ANDROID_BINDER_IPC

	default "binder"

	---help---

	  Default value for the binder.devices parameter.



	  The binder.devices parameter is a comma-separated list of strings

	  that specifies the names of the binder device nodes that will be

	  created. Each binder device has its own context manager, and is

	  therefore logically separated from the other devices.



config ANDROID_BINDER_IPC_32BIT

	bool

	depends on !64BIT && ANDROID_BINDER_IPC

drivers/android/binder.c

+783 −223

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/gadget/configfs.c

+0 −5
Original line number Diff line number Diff line
@@ -425,11 +425,6 @@ static int config_usb_cfg_link( 
	}



	f = usb_get_function(fi);

	if (f == NULL) {

		/* Are we trying to symlink PTP without MTP function? */

		ret = -EINVAL; /* Invalid Configuration */

		goto out;

	}

	if (IS_ERR(f)) {

		ret = PTR_ERR(f);

		goto out;

drivers/usb/gadget/function/f_audio_source.c

+3 −4
Original line number Diff line number Diff line
@@ -377,10 +377,9 @@ static void audio_send(struct audio_dev *audio) 


	/* compute number of frames to send */

	now = ktime_get();

	msecs = ktime_to_ns(now) - ktime_to_ns(audio->start_time);

	do_div(msecs, 1000000);

	frames = msecs * SAMPLE_RATE;

	do_div(frames, 1000);

	msecs = div_s64((ktime_to_ns(now) - ktime_to_ns(audio->start_time)),

			1000000);

	frames = div_s64((msecs * SAMPLE_RATE), 1000);



	/* Readjust our frames_sent if we fall too far behind.

	 * If we get too far behind it is better to drop some frames than

drivers/usb/gadget/function/f_mtp.c

+1 −1
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ struct usb_function *function_alloc_mtp_ptp(struct usb_function_instance *fi, 
		pr_err("\t2: Create MTP function\n");

		pr_err("\t3: Create and symlink PTP function"

				" with a gadget configuration\n");

		return NULL;

		return ERR_PTR(-EINVAL); /* Invalid Configuration */

	}



	dev = fi_mtp->dev;