13 Mar, 2010
1 commit
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
doc: fix typo in comment explaining rb_tree usage
Remove fs/ntfs/ChangeLog
doc: fix console doc typo
doc: cpuset: Update the cpuset flag file
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove drivers/parport/ChangeLog
Remove drivers/char/ChangeLog
doc: typo - Table 1-2 should refer to "status", not "statm"
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
devres/irq: Fix devm_irq_match comment
Remove reference to kthread_create_on_cpu
tree-wide: Assorted spelling fixes
tree-wide: fix 'lenght' typo in comments and code
drm/kms: fix spelling in error message
doc: capitalization and other minor fixes in pnp doc
devres: typo fix s/dev/devm/
Remove redundant trailing semicolons from macros
fix typo "definetly" -> "definitely" in comment
tree-wide: s/widht/width/g typo in comments
...Fix trivial conflict in Documentation/laptops/00-INDEX
08 Mar, 2010
2 commits
-
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c -
A pointer to omap24xxcam_probe is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded. Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.Signed-off-by: Uwe Kleine-König
Acked-by: Sakari Ailus
Acked-by: Trilok Soni
Cc: Hans Verkuil
Cc: Mauro Carvalho Chehab
Cc: Andrew Morton
Signed-off-by: Greg Kroah-Hartman
04 Mar, 2010
2 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (220 commits)
USB: backlight, appledisplay: fix incomplete registration failure handling
USB: pl2303: remove unnecessary reset of usb_device in urbs
USB: ftdi_sio: remove obsolete check in unthrottle
USB: ftdi_sio: remove unused tx_bytes counter
USB: qcaux: driver for auxiliary serial ports on Qualcomm devices
USB: pl2303: initial TIOCGSERIAL support
USB: option: add Longcheer/Longsung vendor ID
USB: fix I2C API usage in ohci-pnx4008.
USB: usbmon: mask seconds properly in text API
USB: sisusbvga: no unnecessary GFP_ATOMIC
USB: storage: onetouch: unnecessary GFP_ATOMIC
USB: serial: ftdi: add CONTEC vendor and product id
USB: remove references to port->port.count from the serial drivers
USB: tty: Prune uses of tty_request_room in the USB layer
USB: tty: Add a function to insert a string of characters with the same flag
USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration()
USB: tty: kill request_room for USB ACM class
USB: tty: sort out the request_room handling for whiteheat
USB: storage: fix misplaced parenthesis
USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers
... -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
firewire: ohci: extend initialization log message
firewire: ohci: fix IR/IT context mask mixup
firewire: ohci: add module parameter to activate quirk fixes
firewire: ohci: use an ID table for quirks detection
firewire: ohci: reorder struct fw_ohci for better cache efficiency
firewire: ohci: remove unused dualbuffer IR code
firewire: core: combine a bit of repeated code
firewire: core: change type of a data buffer
firewire: cdev: increment ABI version number
firewire: cdev: add more flexible cycle timer ioctl
firewire: core: rename an internal function
firewire: core: fix an information leak
firewire: core: increase stack size of config ROM reader
firewire: core: don't fail device creation in case of too large config ROM blocks
firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
firewire: remove incomplete Bus_Time CSR support
firewire: get_cycle_timer optimization and cleanup
firewire: ohci: enable cycle timer fix on ALi and NEC controllers
firewire: ohci: work around cycle timer bugs on VIA controllers
firewire: make PCI device id constant
...
03 Mar, 2010
1 commit
-
Straightforward push into the drivers to allow
auditing individual drivers separatelySigned-off-by: Oliver Neukum
Acked-by: Mauro Carvalho Chehab
Cc: Jiri Kosina
Signed-off-by: Greg Kroah-Hartman
01 Mar, 2010
1 commit
-
Conflicts:
drivers/firmware/iscsi_ibft.c
27 Feb, 2010
33 commits
-
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits)
V4L-DVB: cx88-dvb: remove extra attribution for core
V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
V4L/DVB: Add support for SMT7020 to cx88
V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment
V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix
V4L/DVB: gspca_stv06xx: Add support for camera button
V4L/DVB: gspca_ov519: add support for the button on ov511 based cams
V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams
V4L/DVB: gspca_ov519: add support for the button on ov519 based cams
V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set
V4L/DVB: gspca_main: some input error handling fixes
V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs
V4L/DVB: gspca_pac7302: much improved exposure control
V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras
V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls
V4L/DVB: Documentation: gspca.txt: update known mr97310a cams
V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix
V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480
V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls
V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl
... -
ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation
has a bug that causes endless loop when Payload Pointer of MPEG2-TS
frame is 182 or 183. Anyone who sends malicious MPEG2-TS frame will
cause the receiver of ULE SNDU to go into endless loop.This patch was generated and tested against linux-2.6.32.9 and should
apply cleanly to linux-2.6.33 as well because there was only one typo
fix to dvb_net.c since v2.6.32.This bug was brought to you by modern day Santa Claus who decided to
shower the satellite dish at Keio University with heavy snow causing
huge burst of errors. We, receiver end, received Santa Claus's gift in
the form of kernel bug.Care has been taken not to introduce more bug by fixing this bug, but
please scrutinize the code for I always produces buggy code.Signed-off-by: Ang Way Chuang
Acked-by: Mauro Carvalho Chehab
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds -
This is not needed, since the function already do it. Also, it causes
a warning at the compilation, since a new var is declared in the middle
of the code.Signed-off-by: Mauro Carvalho Chehab
-
When code < 0. Fix this.
Signed-off-by: Baruch Siach
Signed-off-by: Guennadi Liakhovetski
CC: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab -
This patch adds support for the built-in dvb device
of a Samsung SMT7020s (x86 based STB) to the cx88 family.Signed-off-by: Dirk Herrendoerfer
Signed-off-by: Helmut Auer
Signed-off-by: Mauro Carvalho Chehab -
This cosmetic patch corrects a wrong unicode "micro" character in a comment.
Signed-off-by: Tobias Lorenz
Signed-off-by: Mauro Carvalho Chehab -
Only tested with an stv6422 based cam, as that is the only stv06xx cam
I have with a button.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Due to hardware limitations this only works while the camera is
streaming.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Due to hardware limitations this only works while the camera is
streaming.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Note due to hardware limitiations (no interrupt endpoint), this only works
when the camera is streaming.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gspca_main: Fix a compile error when CONFIG_INPUT is not set.
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
2 small changes to input device error handling:
1) Make it fatal when we fail to create an input device (it is either this
or add checks for gspca_dev->input_dev being NULL in a lot of places)
2) Since we allow gspca_input_create_urb() to fail everywhere we call it,
and thus never check its return value, make it void.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Allow use of the gspca core input device creation code by subdrivers which
have non interrupt driven camera buttons.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
My experience with fixing up the controls for the PAS sensors in
sonixb, has lead me to re-investigate the exposure control for the
pac7302. I've now found a regular exposure register in register bank 3
(which seems to be the sensor registers bank), and with this added a proper
fine grained exposure control. This patch also updates the do_autogain
function to work properly with this new finer grained control.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Make the sonixb driver handle pas106 and pas202 cameras, when both it
and the sn9c102 driver are enabled in the kernel configuration.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Fixup brightness ctrl and add gain and exposure ctrls for PAS106B sensors,
this allows enabling autogain (done), and makes the cam usable in low light
conditions.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
This camera has a sensor type we did not support sofar, this patch adds
support for the new sensor type found in the Sakar 1638x CyberPix.Signed-off-by: Theodore Kilgore
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
In 640x480, if the reg11 has less than 4, the image is
unstable (the bridge goes into a higher compression mode
which we have not reverse engineered yet).Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Fixup brightness ctrl and add gain and exposure ctrls for PAS202BCB sensors,
this allows enabling autogain (done), and makes the cam usable in low light
conditions.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Some sensors only allow controlling the exposure by changing the clockdiv,
which means that exposure takes pretty large jumps (for example when going
from a div of 1 to 2, the exposure doubles). Use 2 different entries in
the controls array for these 2 different types of exposure (always
disabling one), and;Add a new autogain algorithm for the coarse exposure case, which normally
changes the gain setting, only touching the exposure setting if the desired
luminance cannot be reached with gain, and after an exposure change once more
first tries gain, etc. Thus avoiding exposure changes, and the resulting
oscilation because of the huge steps these exposure controls take.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Leave bridge gain at 1.0 when we have a sensor gain, while at it also
change the bridge gain setting code to write both registers in one go
saving us a usb transaction.Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gspca_sonixj: Add camera button support
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gspca_sonixb: Add support for camera button
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gscpa_zc3xx: Add support for camera button
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gscpa_pac7311: Add support for camera button
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gscpa_pac207: Add support for camera button
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
gspca_sq905c: Add an additional USB-ID
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Simplify sensor detection a bit (share more of the code between cif and vga
cameras). Also remove an unnecessary write from zero_the_pointer().Signed-off-by: Theodore Kilgore
Signed-off-by: Hans de Goede
Signed-off-by: Mauro Carvalho Chehab -
Based on experiments by Eric Wescott, edit the Sony GigaPocket (Kikyou)
card entry video and audio mux settings.Signed-off-by: Andy Walls
Signed-off-by: Mauro Carvalho Chehab -
This is a slightly modified version of Eric Anderson's original patch
for the Sony Giga Pocket board. It has been updated to apply to the
latest ivtv driver version by Hans Verkuil and
Andy Walls . Also Andy Walls modified the patch to
use a new Sony BTF-Pnx01Z tuner entry based on Eric Anderson's experimental
findings for the bandswitch.>From Eric Anderson's original email:
1. The tuner on the card doesn't seem to match any standard
ones. I modified an existing tuner entry. Ideally a new tuner
entry should be created. (The only difference from the one I
modified is that the low-to-mid range frequency cut-off is
slightly different, as are the bit config settings.)2. It wasn't obvious how to choose a second audio input other
than using "radio" as an option. Basically there's two GPIO
audio inputs. Using radio allowed me to avoid major restructuring
to the code. (perhaps other cards don't have this often...)3. It's not clear that there's a mute setting that works. Not
sure why.4. I haven't had a chance to test the two Svideo inputs. I set
them to COMPOSITE1 and SVIDEO2, but I'm not sure those are the
correct settings. The standard composite video inputs seem to work.Signed-off-by: Andy Walls
Signed-off-by: Mauro Carvalho Chehab -
Sony makes custome tuners for its GigaPocket line of ivtv based capture
cards. This adds an entry to the tuner-types list for such tuners.
Parameters are based on experiments by Eric Anderson .Signed-off-by: Andy Walls
Signed-off-by: Mauro Carvalho Chehab -
ivtv_api_get_data() was performing more PCI MMIO than needed, resulting
often in it accounting for more than half the total time spent in
ivtv_irq_handler(). Now it only reads at most 7 of the 16 mailbox data words
over the PCI bus, and in some instances only 2 or 3 data words as needed.Signed-off-by: Andy Walls
Signed-off-by: Mauro Carvalho Chehab
