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

Commit 7d167662 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: panel: fix lcd panel driver build failure
  Staging: android: fix up units in timed_gpio
  Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
  Staging: at76_usb: Add support for OQO Model 01+
  Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
  Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
parents 6707fbb5 6136ac86

drivers/staging/android/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION 
	bool "Android RAM Console Enable error correction"

	default n

	depends on ANDROID_RAM_CONSOLE

	depends on !ANDROID_RAM_CONSOLE_EARLY_INIT

	select REED_SOLOMON

	select REED_SOLOMON_ENC8

	select REED_SOLOMON_DEC8

drivers/staging/android/ram_console.c

+14 −0
Original line number Diff line number Diff line
@@ -224,9 +224,23 @@ static int __init ram_console_init(struct ram_console_buffer *buffer, 
	ram_console_buffer_size =

		buffer_size - sizeof(struct ram_console_buffer);



	if (ram_console_buffer_size > buffer_size) {

		pr_err("ram_console: buffer %p, invalid size %d, datasize %d\n",

		       buffer, buffer_size, ram_console_buffer_size);

		return 0;

	}



#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION

	ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size,

						ECC_BLOCK_SIZE) + 1) * ECC_SIZE;



	if (ram_console_buffer_size > buffer_size) {

		pr_err("ram_console: buffer %p, invalid size %d, "

		       "non-ecc datasize %d\n",

		       buffer, buffer_size, ram_console_buffer_size);

		return 0;

	}



	ram_console_par_buffer = buffer->data + ram_console_buffer_size;

drivers/staging/android/timed_gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att 
	if (hrtimer_active(&gpio_data->timer)) {

		ktime_t r = hrtimer_get_remaining(&gpio_data->timer);

		struct timeval t = ktime_to_timeval(r);

		remaining = t.tv_sec * 1000 + t.tv_usec;

		remaining = t.tv_sec * 1000 + t.tv_usec / 1000;

	} else

		remaining = 0;

drivers/staging/at76_usb/Kconfig

+1 −1
Original line number Diff line number Diff line 
config USB_ATMEL

	tristate "Atmel at76c503/at76c505/at76c505a USB cards"

	depends on MAC80211 && WLAN_80211 && USB

	depends on WLAN_80211 && USB

	default N

	select FW_LOADER

	---help---

drivers/staging/at76_usb/at76_usb.c

+3776 −972

File changed.

Preview size limit exceeded, changes collapsed.