linux-dev/drivers/staging/lirc, branch master

staging: Move media drivers to staging/media

2011-11-03T09:59:03Z

In practice, it is being hard to distinguish when a patch should go to staging tree or to the media tree. Better to distinguish it, by putting the media drivers at a separate staging directory. Newer staging drivers that include anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should go to the drivers/staging/media tree. Acked-by: Greg Kroah-Hartman Signed-off-by: Mauro Carvalho Chehab

staging: irq: Remove IRQF_DISABLED

2011-09-16T18:09:38Z

This flag is a NOOP and can be removed now. Signed-off-by: Yong Zhang Signed-off-by: Greg Kroah-Hartman

staging: lirc_sasem: fix NULL pointer dereference in sasem_probe

2011-09-06T18:46:21Z

If any memory allocation failed, goto alloc_status_switch leads to mutex_unlock(&context->ctx_lock) while context is NULL. The patch moves alloc_status_switch to handle error conditions in correct way. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Greg Kroah-Hartman

staging: lirc: fix mismatch in mutex lock-unlock in imon_probe

2011-09-06T18:46:20Z

If kzalloc failed for allocation of context, goto alloc_status_switch leads to unlock of unacquired driver_lock. The patch moves mutex_lock(&driver_lock) before allocation of context. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Greg Kroah-Hartman

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-07-26T06:26:34Z

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits) staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. staging:iio:kfifo_buf fix double initialization of the ring device structure. staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. staging:iio:imu fix missing register table index for some channels spectra: enable device before poking it staging: rts_pstor: Fix a miswriting staging/lirc_bt829: Return -ENODEV when no hardware is found. staging/lirc_parallel: remove pointless prototypes. staging/lirc_parallel: fix panic on rmmod staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata. Staging: zram: Fix kunmapping order Revert "gma500: Fix dependencies" gma500: Add medfield header gma500: wire up the mrst i2c bus from chip_info gma500: Fix DPU build gma500: Clean up the DPU config and make it runtime gma500: resync with Medfield progress gma500: Use the mrst helpers and power control for mode commit gma500@ Fix backlight range error gma500: More Moorestown muddle meddling means MM maybe might modeset ... Fix up fairly trivial conflicts all over, mostly due to header file cleanup conflicts, but some deleted files and some just context changes: - Documentation/feature-removal-schedule.txt - drivers/staging/bcm/headers.h - drivers/staging/brcm80211/brcmfmac/dhd_linux.c - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h - drivers/staging/brcm80211/brcmfmac/wl_iw.c - drivers/staging/et131x/et131x_netdev.c - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c - drivers/staging/rtl8192e/r8192E.h - drivers/staging/usbip/userspace/src/utils.h

staging/lirc_bt829: Return -ENODEV when no hardware is found.

2011-07-18T20:22:52Z

sys_init_module: 'lirc_bt829'->init suspiciously returned 1, it should follow 0/-E convention sys_init_module: loading module anyway... Pid: 8511, comm: modprobe Tainted: G WC 3.0.0-rc6+ #73 Call Trace: [] sys_init_module+0x217/0x230 [] system_call_fastpath+0x16/0x1b Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman

staging/lirc_parallel: remove pointless prototypes.

2011-07-18T20:22:52Z

These are right before the actual definitions, so redundant. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman

staging/lirc_parallel: fix panic on rmmod

2011-07-18T20:22:52Z

lirc_parallel seems to leave a bunch of stuff around after rmmod. Without the patch below modprobe ; rmmod ; modprobe will cause a panic. There are still some remaining problems, (double registration of sysfs files) but this patch is at least a start to survive the panic. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman

Remove unneeded version.h includes from drivers/staging/lirc/

2011-07-05T17:39:39Z

It was pointed out by 'make versioncheck' that some includes of linux/version.h are not needed in drivers/staging/lirc/. This patch removes them. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman

[media] [staging] lirc_serial: allocate irq at init time

2011-07-01T19:32:45Z

There's really no good reason not to just grab the desired IRQ at driver init time, instead of every time the lirc device node is accessed. This also improves the speed and reliability with which a serial transmitter can operate, as back-to-back transmission attempts (i.e., channel change to a multi-digit channel) don't have to spend time acquiring and then releasing the IRQ for every digit, sometimes multiple times, if lircd has been told to use the min_repeat parameter. CC: devel@driverdev.osuosl.org Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab