platform/kernel/linux-stable.git
14 years agoV4L/DVB (13932): em28xx: add PAL support for VBI
Devin Heitmueller [Wed, 25 Nov 2009 02:17:25 +0000 (23:17 -0300)]
V4L/DVB (13932): em28xx: add PAL support for VBI

Make the VBI support work for PAL standards in addition to NTSC.

This work was sponsored by EyeMagnet Limited.

Thanks go out to Andy Walls for providing a CD containing test PAL/VBI captures
and to Steven Toth for providing a PVR-350 to do signal generation with.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13930): dib0700: rework IR logic for firmware 1.20
Devin Heitmueller [Mon, 4 Jan 2010 05:43:19 +0000 (02:43 -0300)]
V4L/DVB (13930): dib0700: rework IR logic for firmware 1.20

When firmware 1.20 was introduced, the dib0700 switched from a polling model
using a USB control message, to the messages being delivered on a USB bulk
pipe.  The code I originally added would do a blocking read on the pipe with a
50ms timeout.  Because the dvb-usb-remote code makes use of the global
workqueue, this resulted in the global workqueue being blocked 50% of the
time.  Also, the synchronous urb_bulk_msg() call would burn excess CPU time
(reflected as an abnormal increase in the system's load average when devices
were connected).

Rework the logic so that we now setup an asynchronous callback on the bulk
pipe, so that we now only handle RC data when it arrives on the pipe.  Note
that we provide a stub function for the RC polling callback so that we can
continue to leverage the shared code in dvb-usb-rc for the setting up of the
input device.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams.
Jean-Francois Moine [Tue, 12 Jan 2010 10:12:43 +0000 (07:12 -0300)]
V4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams.

The bug was introduced when adding the sensor adcm1700.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13926): gspca - pac7302: Fix a random USB error.
Jean-Francois Moine [Mon, 11 Jan 2010 18:06:12 +0000 (15:06 -0300)]
V4L/DVB (13926): gspca - pac7302: Fix a random USB error.

When loading the register 0x49 of the page 3, the usb_control_msg() sometimes
fails with error -71 or -62.
This change skips loading the register 0x48.

Tested-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13925): gspca - main: Change the check of the USB video interface.
Jean-Francois Moine [Sun, 10 Jan 2010 19:36:53 +0000 (16:36 -0300)]
V4L/DVB (13925): gspca - main: Change the check of the USB video interface.

Some webcams have many interfaces with the same interface class, so the
previous interface check did not work.
The new code checks if the interface number is zero or the only one.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13924): gspca - sunplus: Optimize and remove unused sequences.
Jean-Francois Moine [Sun, 10 Jan 2010 17:39:24 +0000 (14:39 -0300)]
V4L/DVB (13924): gspca - sunplus: Optimize and remove unused sequences.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13923): gspca - zc3xx: Simplify code.
Jean-Francois Moine [Fri, 8 Jan 2010 11:08:12 +0000 (08:08 -0300)]
V4L/DVB (13923): gspca - zc3xx: Simplify code.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13922): gspca - zc3xx: Switch off the LED on resume.
Jean-Francois Moine [Fri, 8 Jan 2010 11:04:21 +0000 (08:04 -0300)]
V4L/DVB (13922): gspca - zc3xx: Switch off the LED on resume.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13921): gspca - zc3xx: Remove unuseful register write.
Jean-Francois Moine [Fri, 8 Jan 2010 11:03:23 +0000 (08:03 -0300)]
V4L/DVB (13921): gspca - zc3xx: Remove unuseful register write.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13920): gspca - zc3xx: Let default sharpness for sensor pas202b.
Jean-Francois Moine [Fri, 8 Jan 2010 11:02:42 +0000 (08:02 -0300)]
V4L/DVB (13920): gspca - zc3xx: Let default sharpness for sensor pas202b.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13919): gspca - zc3xx: Fix hdcs2020 probe.
Jean-Francois Moine [Fri, 8 Jan 2010 11:01:43 +0000 (08:01 -0300)]
V4L/DVB (13919): gspca - zc3xx: Fix hdcs2020 probe.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13918): gspca - zc3xx: Rename the USB sequences.
Jean-Francois Moine [Fri, 8 Jan 2010 10:06:06 +0000 (07:06 -0300)]
V4L/DVB (13918): gspca - zc3xx: Rename the USB sequences.

The new names tell the image resolution: 'Scale' is the smaller image.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13917): gspca - zc3xx: Cleanup code.
Jean-Francois Moine [Thu, 7 Jan 2010 18:59:12 +0000 (15:59 -0300)]
V4L/DVB (13917): gspca - zc3xx: Cleanup code.

- update copyright and module author
- change __u8/16 to u8/16
- set unsigned the sd sensor
- initialize the controls by macros

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13915): em28xx: fix a typo on RC6 modes
Mauro Carvalho Chehab [Mon, 11 Jan 2010 13:47:33 +0000 (10:47 -0300)]
V4L/DVB (13915): em28xx: fix a typo on RC6 modes

Thanks to: Devin Heitmueller <dheitmueller@kernellabs.com> for double
checking it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13913): saa7127: Add support for generating SECAM output for the SAA712...
Andy Walls [Mon, 4 Jan 2010 02:28:18 +0000 (23:28 -0300)]
V4L/DVB (13913): saa7127: Add support for generating SECAM output for the SAA712[89] chips

This change fixes up saa7127_s_std() generate SECAM out, if the user has
requested a 50 Hz video standard set that only contains a request for SECAM
standards and not PAL.  Only the SAA712[89] chips can generate SECAM, the
SAA712[67] chips cannot.

I was unclear on the burst start and end values - I couldn't figure out
the units - so I left them the same as for the PAL systems.

A the video decoders on both a PVR-350 (SAA7115) and an HVR-1600 (CX23418)
identify the SECAM signal generated by a SAA7129 with this patch as SECAM.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13912): cx18: Fix tuner reset pin in card entry for the Leadtek PVR2100
Sergey Bolshakov [Sun, 3 Jan 2010 00:56:42 +0000 (21:56 -0300)]
V4L/DVB (13912): cx18: Fix tuner reset pin in card entry for the Leadtek PVR2100

Fix the "xceive_pin" setting from "15" to "1" for the PVR2100 -- the same as
the PVR3100H.  This properly resets the XC2028 tuner on the PVR2100.

Sergey's original email report:

Hi.
Seems cx18 module has incorrect .xceive_pin value for card,
as i see lots of i2c errors in dmesg from xc2028.
i'm using 2.6.32.2, my hardware is:

00:09.0 Multimedia video controller [0400]: Conexant Systems, Inc. CX23418
Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder
[14f1:5b7a]
        Subsystem: LeadTek Research Inc. Device [107d:6f27]
        Flags: bus master, medium devsel, latency 64, IRQ 17
        Memory at f0000000 (32-bit, non-prefetchable) [size=64M]
        Capabilities: [44] Vital Product Data
        Capabilities: [4c] Power Management version 2
        Kernel driver in use: cx18
        Kernel modules: cx18

Following fixes this problem for me, the rest seems working:

Reported-by: Sergey Bolshakov <sbolshakov@altlinux.ru>
Tested-by: Sergey Bolshakov <sbolshakov@altlinux.ru>
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index...
Andy Walls [Fri, 1 Jan 2010 16:25:41 +0000 (13:25 -0300)]
V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index entries

The CX18_CPU_SET_INDEXTABLE command was being called with the wrong number
of arguments causing the index table frame type selection mask to be set wrong.
Now the IDX stream properly sends entries for I, P, and B frames.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing
Andy Walls [Fri, 1 Jan 2010 01:27:28 +0000 (22:27 -0300)]
V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13908): cx18: Add initial working VIDIOC_G_ENC_INDEX ioctl() support
Andy Walls [Fri, 1 Jan 2010 01:09:51 +0000 (22:09 -0300)]
V4L/DVB (13908): cx18: Add initial working VIDIOC_G_ENC_INDEX ioctl() support

VIDIOC_G_ENC_INDEX support see the light of day.
Some notes:
1. With default capture parameters, the CX23418 seems to transfer 192 index
entries (4.5 kB worth) at 10 second intervals.

2. Index streams don't seem to be supported for MPEG 2 TS streams

3. The index entries seem to claim every frame is a B-Frame.  Possible
firmware bug.

4. The cx18 driver does not try to capture an index stream when inserting
sliced VBI into the MPEg stream as the offsets would need fixup.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13907): cx18: Perform automatic rotation of very old, unread IDX buffers
Andy Walls [Thu, 31 Dec 2009 21:27:13 +0000 (18:27 -0300)]
V4L/DVB (13907): cx18: Perform automatic rotation of very old, unread IDX buffers

According to the v4l2 spec, very old MPEG index entries needs to be discarded
in favor of newer index entries.  This change ensures the firmware always has
buffers for index entries at the expense of the oldest unread buffers.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13906): cx18: Start IDX streams automatically as an internal associated...
Andy Walls [Thu, 31 Dec 2009 20:19:25 +0000 (17:19 -0300)]
V4L/DVB (13906): cx18: Start IDX streams automatically as an internal associated stream

This change starts the IDX stream along with the MPG stream as an internal
use (only) stream much like the VBI stream can be started as an internal use
stream for inserting sliced VBI packets.

The IDX stream is not started automatically with an MPEG strem if the IDX
stream is disabled (no buffers allocated) or if sliced VBI insertion is being
performed by the cx18 driver.  The cx18 driver doing sliced VBI insertion
makes the offsets in the IDX stream inaccurate for the final MPEG stream
presented to user space.  Since fixing the IDX offsets ourselves is not easy
and we cannot easily do what ivtv does to fix the offsets, we'll make sliced
VBI insertion and MPEG Index capture mutually exclusive for now.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13905): cx18: Allow MPEG index streams to be started and stopped internally
Andy Walls [Thu, 31 Dec 2009 05:14:51 +0000 (02:14 -0300)]
V4L/DVB (13905): cx18: Allow MPEG index streams to be started and stopped internally

This change allows the IDX stream to be started and stopped as any other
stream even though it has no associated device node.  This is needed for
cx18 driver internal use.

Also always tell the CX23418 to generate index entries when an analog capture
starts and the IDX stream has had buffers allocated (i.e. is enabled).

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on module unload
Andy Walls [Thu, 31 Dec 2009 04:35:08 +0000 (01:35 -0300)]
V4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on module unload

Fix a long standing memory leak of stream buffers for streams that did not
have a struct video_device allocated: namely the TS and IDX streams.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13903): cx18: Encapsulate check for a stream being enabled into an inline...
Andy Walls [Thu, 31 Dec 2009 03:26:49 +0000 (00:26 -0300)]
V4L/DVB (13903): cx18: Encapsulate check for a stream being enabled into an inline function

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13902): cx18: Update MPEG Index stream buffers module option processing
Andy Walls [Thu, 31 Dec 2009 01:54:53 +0000 (22:54 -0300)]
V4L/DVB (13902): cx18: Update MPEG Index stream buffers module option processing

Update the module options related to INDEX stream buffer allocation.  A single
CX2341[5678] index entry is only 24 bytes.  Large buffers for the IDX stream
will prevent the CX23418 from transferring index data over at all.  Buffers
of around 1.5 kB or 64 index entries seem to be just fine.  We'll default to
63 buffers/MDLs as that is the firmware limit per stream and IDX stream buffers
are not high rate.  There is no reason on earth to allocate the previous 1 MB
default of buffer space for the IDX stream.

This is in anticipation of implementing the G_ENC_INDEX ioctl() in the cx18
driver.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant.
Marton Nemeth [Wed, 30 Dec 2009 12:12:41 +0000 (09:12 -0300)]
V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant.

The ctrls field of struct sd_desc is declared as const
in gspca.h. It is worth to initialize the content also with
constant values.

Signed-off-by: Marton Nemeth <nm127@freemail.hu>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13898): gspca - some subdrivers: Make sd_desc const.
Márton Németh [Tue, 5 Jan 2010 15:39:02 +0000 (12:39 -0300)]
V4L/DVB (13898): gspca - some subdrivers: Make sd_desc const.

The function callbacks in sd_desc are defined at compile time and
they do not change at runtime. Make the sd_desc initializations const.

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13897): gspca - main: Check the interface class at probe time.
Jean-Francois Moine [Tue, 5 Jan 2010 07:44:00 +0000 (04:44 -0300)]
V4L/DVB (13897): gspca - main: Check the interface class at probe time.

The USB video interface was checked as having the number zero, but
some webcams have other values. The test is now done on the interface
class which may be either 255 (vendor spec) or 0 (class per interface).

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13896): gspca - zc3xx: Adjust the pas202b exchanges.
Jean-Francois Moine [Mon, 4 Jan 2010 19:09:47 +0000 (16:09 -0300)]
V4L/DVB (13896): gspca - zc3xx: Adjust the pas202b exchanges.

- adapt the start sequences from the info file of the ms-win driver
  of the webcams 046d:08a2/046d:08aa (lvWIMv.inf)
- disable the brightness for this sensor

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13895): gspca - zc3xx: Fix the contrast control.
Jean-Francois Moine [Mon, 4 Jan 2010 18:54:59 +0000 (15:54 -0300)]
V4L/DVB (13895): gspca - zc3xx: Fix the contrast control.

The previous calculation gave bad gamma tables.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13894): gspca - sonixj: Add more controls.
Jean-Francois Moine [Wed, 30 Dec 2009 07:53:07 +0000 (04:53 -0300)]
V4L/DVB (13894): gspca - sonixj: Add more controls.

- sharpness
- brightness for adcm1700
- adjust brightness/exposure for adcm1700
- add some comments

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13893): gspca - vc032x: Change the sensor of 046d:0892 and 046d:0896.
Jean-Francois Moine [Sat, 26 Dec 2009 19:07:24 +0000 (16:07 -0300)]
V4L/DVB (13893): gspca - vc032x: Change the sensor of 046d:0892 and 046d:0896.

- new sensor POxxxx (unknown ID)
- no probe
- new controls
- table for the disabled controls

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13892): gspca - vc032x: Add the H and V flip controls for sensor mi1320.
Jean-Francois Moine [Sat, 26 Dec 2009 18:21:57 +0000 (15:21 -0300)]
V4L/DVB (13892): gspca - vc032x: Add the H and V flip controls for sensor mi1320.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13891): gspca - vc032x: Fix bad probe of the sensor mi1320.
Jean-Francois Moine [Sat, 26 Dec 2009 18:18:02 +0000 (15:18 -0300)]
V4L/DVB (13891): gspca - vc032x: Fix bad probe of the sensor mi1320.

- have 2 tables for sensor probe
- with the same ID, the sensor mi1320 is found with the bridge vc0321,
        the sensor mi1320_soc with the bridge vc0323
- add some comments

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13885): zr364xx: fix support for Aiptek DV T300
Antoine Jacquet [Sun, 27 Dec 2009 21:22:05 +0000 (18:22 -0300)]
V4L/DVB (13885): zr364xx: fix support for Aiptek DV T300

Added a new initialization method for Aiptek DV T300.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13708

Tested-by: Hámorszky Balázs <balihb@gmail.com>
Signed-off-by: Antoine Jacquet <royale@zerezo.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13883): gspca - m5602: Be less verbose during sensor probe
Erik Andrén [Sun, 27 Dec 2009 08:53:28 +0000 (05:53 -0300)]
V4L/DVB (13883): gspca - m5602: Be less verbose during sensor probe

Currently all probed sensor types are emitted in the kernel log, generating unnecessary noise. Be less verbose and only report what sensor is found (if any)

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13881): gspca - stv06xx: Clean up the dump bridge function
Erik Andrén [Sat, 26 Dec 2009 21:00:02 +0000 (18:00 -0300)]
V4L/DVB (13881): gspca - stv06xx: Clean up the dump bridge function

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13879): dvb_frontend: report what ioctl were called on debug mode
Mauro Carvalho Chehab [Thu, 31 Dec 2009 21:14:54 +0000 (18:14 -0300)]
V4L/DVB (13879): dvb_frontend: report what ioctl were called on debug mode

When printing that an iocl were called, report the ioctl number.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13878): dvb_frontend: Print dump on get after filling the data
Mauro Carvalho Chehab [Thu, 31 Dec 2009 20:49:32 +0000 (17:49 -0300)]
V4L/DVB (13878): dvb_frontend: Print dump on get after filling the data

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13872): gspca - sonixj: Add sensor adcm1700 and webcam 0c45:614a.
Jean-Francois Moine [Sun, 20 Dec 2009 15:31:28 +0000 (12:31 -0300)]
V4L/DVB (13872): gspca - sonixj: Add sensor adcm1700 and webcam 0c45:614a.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13871): gspca - benq: New subdriver for camera 04a5:3035.
Jean-Francois Moine [Sun, 20 Dec 2009 12:09:22 +0000 (09:09 -0300)]
V4L/DVB (13871): gspca - benq: New subdriver for camera 04a5:3035.

Tested-by: Francesco Lavra <francescolavra@interfree.it>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13870): gspca - zc3xx: Bad detection of sensor HV7131R(c).
Jean-Francois Moine [Sun, 20 Dec 2009 08:07:10 +0000 (05:07 -0300)]
V4L/DVB (13870): gspca - zc3xx: Bad detection of sensor HV7131R(c).

The webcam 0ac8:303b may have the sensors HV7131B or HV7131R(c).
This changeset checks the HV7131 type.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13867): gspca - zc3xx: Add one more chipset ID of tas5130K.
Luis Maia [Tue, 15 Dec 2009 16:40:44 +0000 (13:40 -0300)]
V4L/DVB (13867): gspca - zc3xx: Add one more chipset ID of tas5130K.

This ID was found in a webcam 0ac8:301b.

Signed-off-by: Luis Maia <lmaia@royalhat.org>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13866): gspca - main: Add the cam flag 'no_urb_create'.
Jean-Francois Moine [Tue, 15 Dec 2009 08:23:04 +0000 (05:23 -0300)]
V4L/DVB (13866): gspca - main: Add the cam flag 'no_urb_create'.

This flag permits subdrivers to create specific transfer URBs.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13865): gspca - main: Optimize code.
Jean-Francois Moine [Tue, 15 Dec 2009 08:16:04 +0000 (05:16 -0300)]
V4L/DVB (13865): gspca - main: Optimize code.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13856): ir-keytable: simplify and avoid a warning
Mauro Carvalho Chehab [Tue, 29 Dec 2009 11:25:13 +0000 (08:25 -0300)]
V4L/DVB (13856): ir-keytable: simplify and avoid a warning

/home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c: In function 'ir_setkeycode':
/home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c:190: warning: 'newkeymap' may be used uninitialized in this function

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13848): smsdvb: Add the proper status for IsRfLocked
Mauro Carvalho Chehab [Fri, 25 Dec 2009 21:04:17 +0000 (18:04 -0300)]
V4L/DVB (13848): smsdvb: Add the proper status for IsRfLocked

Now, if RF is locked but demod is not locked, it will report:
>>> tuning status == 0x03

This happens, for example, if the device is on DVB-T, and the video
standard is ISDB-T.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13847): smsdvb: Remove a wrong debug message
Mauro Carvalho Chehab [Fri, 25 Dec 2009 14:47:33 +0000 (11:47 -0300)]
V4L/DVB (13847): smsdvb: Remove a wrong debug message

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13846): smsdvb: Properly implement stats for both DVB and ISDB-T
Mauro Carvalho Chehab [Fri, 25 Dec 2009 14:29:42 +0000 (11:29 -0300)]
V4L/DVB (13846): smsdvb: Properly implement stats for both DVB and ISDB-T

After taking a look at the driver's history and doing some tests with
DVB and ISDB-T, it was noticed that the stats were incomplete, for
ISDB-T, and weren't working for DVB.

Fixed the code and added a debug code to print the complete stats at
dmesg. This debug is useful to improve the stats of this driver.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13845): smsdvb: Fix the frequency switch that broke with v5 API conversion
Mauro Carvalho Chehab [Fri, 25 Dec 2009 10:29:06 +0000 (07:29 -0300)]
V4L/DVB (13845): smsdvb: Fix the frequency switch that broke with v5 API conversion

Bandwidth is in Hz, not in kHz.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13844): smsdvb: Properly report the Delivery System
Mauro Carvalho Chehab [Fri, 25 Dec 2009 10:17:03 +0000 (07:17 -0300)]
V4L/DVB (13844): smsdvb: Properly report the Delivery System

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13843): dib8000: Properly report Delivery System as SYS_ISDBT
Mauro Carvalho Chehab [Fri, 25 Dec 2009 09:59:21 +0000 (06:59 -0300)]
V4L/DVB (13843): dib8000: Properly report Delivery System as SYS_ISDBT

Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13842): smsdvb: Convert it to use DVB API v5 (S2API)
Mauro Carvalho Chehab [Wed, 23 Dec 2009 14:28:46 +0000 (11:28 -0300)]
V4L/DVB (13842): smsdvb: Convert it to use DVB API v5 (S2API)

Based on a patch originally written by Michael Krufky <mkrufky@linuxtv.org>
for a preliminar S2API spec.

The patch were ported to the S2API and had the ISDB-T API additions to
honor the auto mode, while keep allowing manual tuning.

Tested with both the original dvb-apps and the new dvb-apps-isdbt scan,
that uses a different channel.conf and uses S2API with ISDB-T extensions.

Thanks-to: Michael Krufky <mkrufky@linuxtv.org> for his first version
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13841): smsdvb: Make stats to work
Mauro Carvalho Chehab [Wed, 23 Dec 2009 13:07:16 +0000 (10:07 -0300)]
V4L/DVB (13841): smsdvb: Make stats to work

Siano series of patches seemed to cause a regression on reporting DTV
statistics. Due to that, signal indication weren't received, preventing
applications like scan to work.

Tested with ISDB-T signals and got the same scan result as with a
dib0700/dib8000 device.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13840): smsusb: Add ISDB-T firmware for Hauppauge WinTV-Nova-T-MiniStick
Michael Krufky [Wed, 23 Dec 2009 00:09:52 +0000 (21:09 -0300)]
V4L/DVB (13840): smsusb: Add ISDB-T firmware for Hauppauge WinTV-Nova-T-MiniStick

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13839): smsdvb: add ISDB-T as DVB-T tuning support hack
Michael Krufky [Wed, 23 Dec 2009 00:08:49 +0000 (21:08 -0300)]
V4L/DVB (13839): smsdvb: add ISDB-T as DVB-T tuning support hack

Activate ISDB-T mode using module option default_mode=6.

hack: use 4 lower bits in frequency for segment number

[mchehab@redhat.com: fix merge conflicts and CodingStyle]
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13838): atbm8830: use AGC setting from config
David Wong [Sat, 28 Nov 2009 11:36:31 +0000 (08:36 -0300)]
V4L/DVB (13838): atbm8830: use AGC setting from config

Improves ATBM8830 reception by using per card AGC configuration rather
than register default.

Signed-off-by: David T. L. Wong <davidtlwong@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13833): ir-core: some functions can be static
Mauro Carvalho Chehab [Thu, 17 Dec 2009 12:24:37 +0000 (09:24 -0300)]
V4L/DVB (13833): ir-core: some functions can be static

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras
Daniel Ritz [Sat, 12 Dec 2009 17:57:17 +0000 (14:57 -0300)]
V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras

For some unknown reason, on a MacBookPro5,3 the iSight sometimes report
a different video format GUID. This patch add the other (wrong) GUID to
the format table, making the iSight work always w/o other problems.

What it should report: 32595559-0000-0010-8000-00aa00389b71
What it often reports: 32595559-0000-0010-8000-000000389b71

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13828): uvcvideo: Make the quirks module parameter override the built-in...
Laurent Pinchart [Thu, 10 Dec 2009 13:00:39 +0000 (10:00 -0300)]
V4L/DVB (13828): uvcvideo: Make the quirks module parameter override the built-in quirks

The quirks module parameter is or'ed with the built-in quirks for the
device being probed. This make it impossible to disable a built-in quirk
without recompiling the driver.

Replace the built-in quirks with the quirks module parameter instead of
or'ing the values.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13827): uvcvideo: Switch to a monotonic clock for V4L2 buffers timestamps
Laurent Pinchart [Thu, 10 Dec 2009 01:57:48 +0000 (22:57 -0300)]
V4L/DVB (13827): uvcvideo: Switch to a monotonic clock for V4L2 buffers timestamps

The realtime clock provided by do_gettimeofday() is affected by time
jumps caused by NTP or DST. Furthermore, preliminary investigation
showed that SMP systems the realtime clock is based on the CPU TSC,
and those could get slightly out of sync, resulting in jitter in the
timestamps depending on which processor handles the USB interrupts.

Instead of the realtime clock, use a monotonic high resolution clock to
timestamp the buffer. As this could in theory introduce a regression
with some userspace applications expecting a realtime clock timestamp,
add a module parameter to switch back to the realtime clock.

Thanks to Paulo Assis for pointing out and investigating the issue.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13825): ir-core: Don't OOPS if IR device props is not defined
Mauro Carvalho Chehab [Thu, 17 Dec 2009 02:46:48 +0000 (23:46 -0300)]
V4L/DVB (13825): ir-core: Don't OOPS if IR device props is not defined

As currently most drivers don't define ir_dev->props, we shouldn't assume
that this field is defined.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13818): Add Prof 7500 DVB-S2 USB card
Igor M. Liplianin [Mon, 14 Dec 2009 23:24:56 +0000 (20:24 -0300)]
V4L/DVB (13818): Add Prof 7500 DVB-S2 USB card

The card based on stv0903 demod, stb6100 tuner.

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13815): gspca - sunplus: Add webcam 052b:1507.
Jean-Francois Moine [Sun, 13 Dec 2009 17:11:07 +0000 (14:11 -0300)]
V4L/DVB (13815): gspca - sunplus: Add webcam 052b:1507.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13680): ir: use unsigned long instead of enum
Mauro Carvalho Chehab [Mon, 14 Dec 2009 16:53:37 +0000 (13:53 -0300)]
V4L/DVB (13680): ir: use unsigned long instead of enum

When preparing the linux-next patches, I got those errors:

include/media/ir-core.h:29: warning: left shift count >= width of type
In file included from include/media/ir-common.h:29,
                 from drivers/media/video/ir-kbd-i2c.c:50:
drivers/media/video/ir-kbd-i2c.c: In function ‘ir_probe’:
drivers/media/video/ir-kbd-i2c.c:324: warning: left shift count >= width of type

Unfortunately, enum is 32 bits on i386. As we define IR_TYPE_OTHER as 1<<63,
it won't work on non 64 bits arch.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13641): Properly update the driver representation for the protocol
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:59:19 +0000 (02:59 -0300)]
V4L/DVB (13641): Properly update the driver representation for the protocol

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13639): ir-sysfs: Properly protect rc_tab changes with a lock
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:56:15 +0000 (02:56 -0300)]
V4L/DVB (13639): ir-sysfs: Properly protect rc_tab changes with a lock

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13638): ir-core: documment missed functions
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:55:03 +0000 (02:55 -0300)]
V4L/DVB (13638): ir-core: documment missed functions

While here, change ir_core_dev_number to be static

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13637): em28xx: allow changing keycode table protocol
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:54:22 +0000 (02:54 -0300)]
V4L/DVB (13637): em28xx: allow changing keycode table protocol

Experimental patch to allow changing the IR protocol. Currently, it support
changing between RC-5 and NEC protocols.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13636): ir-core: add method to change IR protocol
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:46:42 +0000 (02:46 -0300)]
V4L/DVB (13636): ir-core: add method to change IR protocol

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13635): ir-core: Implement protocol table type reading
Mauro Carvalho Chehab [Mon, 14 Dec 2009 05:16:36 +0000 (02:16 -0300)]
V4L/DVB (13635): ir-core: Implement protocol table type reading

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13634): ir-core: allow passing IR device parameters to ir-core
Mauro Carvalho Chehab [Mon, 14 Dec 2009 03:16:55 +0000 (00:16 -0300)]
V4L/DVB (13634): ir-core: allow passing IR device parameters to ir-core

Adds an structure to ir_input_register to contain IR device characteristics,
like supported protocols and a callback to handle protocol event changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoV4L/DVB (13633): ir-core: create a new class for remote controllers
Mauro Carvalho Chehab [Sun, 13 Dec 2009 19:00:08 +0000 (16:00 -0300)]
V4L/DVB (13633): ir-core: create a new class for remote controllers

Add sysfs skeleton to export remote controller information via
/sys/class/irrcv.

For now, the code doesn't do much. It just exports an attribute that
is meant to  report and control the IR protocol used by the keytable.
However, the callbacks for this new attribute weren't set yet.

Also, it lacks symlinks to the used event interface.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
14 years agoLinux 2.6.33 v2.6.33
Linus Torvalds [Wed, 24 Feb 2010 18:52:17 +0000 (10:52 -0800)]
Linux 2.6.33

14 years agoMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Wed, 24 Feb 2010 18:51:21 +0000 (10:51 -0800)]
Merge branch 'urgent' of git://git./linux/kernel/git/kyle/parisc-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Set PCI CLS early in boot.

14 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Wed, 24 Feb 2010 18:51:04 +0000 (10:51 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix broken sn2 build

14 years agoparisc: Set PCI CLS early in boot.
Carlos O'Donell [Mon, 22 Feb 2010 23:25:59 +0000 (23:25 +0000)]
parisc: Set PCI CLS early in boot.

Set the PCI CLS early in the boot process to prevent
device failures. In pcibios_set_master use the new
pci_cache_line_size instead of a hard-coded value.

Signed-off-by: Carlos O'Donell <carlos@codesourcery.com>
Reviewed-by: Grant Grundler <grundler@google.com>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
14 years agoMerge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
Linus Torvalds [Wed, 24 Feb 2010 15:43:02 +0000 (07:43 -0800)]
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix out_le32() macro
  microblaze: Fix cache loop function for cache range

14 years agoMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Wed, 24 Feb 2010 15:42:42 +0000 (07:42 -0800)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "block: improve queue_should_plug() by looking at IO depths"

14 years agomicroblaze: Fix out_le32() macro
Steven J. Magnani [Mon, 22 Feb 2010 15:25:42 +0000 (09:25 -0600)]
microblaze: Fix out_le32() macro

Trailing semicolon causes compilation involving out_le32() to fail.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Fix cache loop function for cache range
Michal Simek [Mon, 15 Feb 2010 09:50:42 +0000 (10:50 +0100)]
microblaze: Fix cache loop function for cache range

I create wrong asm code but none test shows that this part of code is wrong.
I am not convinces that were good idea to create asm optimized macros
for caches. The reason is that there is not optimization with previous code
that's why make sense to add old code and do some benchmarking which
functions are faster.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 24 Feb 2010 03:44:07 +0000 (19:44 -0800)]
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: bug fix for vlan + gro issue
  tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
  cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
  IPv6: better document max_addresses parameter
  MAINTAINERS: update mv643xx_eth maintenance status
  e1000: Fix DMA mapping error handling on RX
  iwlwifi: sanity check before counting number of tfds can be free
  iwlwifi: error checking for number of tfds in queue
  iwlwifi: set HT flags after channel in rxon

14 years agonet: bug fix for vlan + gro issue
Ajit Khaparde [Tue, 16 Feb 2010 20:25:43 +0000 (20:25 +0000)]
net: bug fix for vlan + gro issue

Traffic (tcp) doesnot start on a vlan interface when gro is enabled.
Even the tcp handshake was not taking place.
This is because, the eth_type_trans call before the netif_receive_skb
in napi_gro_finish() resets the skb->dev to napi->dev from the previously
set vlan netdev interface. This causes the ip_route_input to drop the
incoming packet considering it as a packet coming from a martian source.

I could repro this on 2.6.32.7 (stable) and 2.6.33-rc7.
With this fix, the traffic starts and the test runs fine on both vlan
and non-vlan interfaces.

CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: Patrick McHardy <kaber@trash.net>
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Wed, 24 Feb 2010 02:15:05 +0000 (18:15 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: Be in TS_POLLING state during mwait based C-state entry
  ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
  acer-wmi: Respect current backlight level when loading

14 years agoMerge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
Linus Torvalds [Wed, 24 Feb 2010 02:13:34 +0000 (18:13 -0800)]
Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
  drm/nv50: fix vram ptes on IGPs to point at stolen system memory
  drm/nv50: fix instmem binding on IGPs to point at stolen system memory
  drm/nv50: improve vram page table construction
  drm/nv50: more efficient clearing of gpu page table entries
  drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
  drm/nouveau: Fix up pre-nv17 analog load detection.

14 years ago[IA64] Fix broken sn2 build
Hedi Berriche [Tue, 23 Feb 2010 23:58:49 +0000 (23:58 +0000)]
[IA64] Fix broken sn2 build

Revert the change made to arch/ia64/sn/kernel/setup.c by commit
204fba4aa303ea4a7bb726a539bf4a5b9e3203d0 as it breaks the build.

Fixing the build the b94b08081fcecf83fa690d6c5664f6316fe72208 way
breaks xpc because genksyms then fails to generate an CRC for
per_cpu____sn_cnodeid_to_nasid because of limitations in the
generic genksyms code.

Signed-off-by: Hedi Berriche <hedi@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
14 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Tue, 23 Feb 2010 09:27:05 +0000 (01:27 -0800)]
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

14 years agotc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
Atsushi Nemoto [Fri, 19 Feb 2010 05:13:58 +0000 (05:13 +0000)]
tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON

The netif_wake_queue() is called correctly (i.e. only on !txfull
condition) from txdone routine.  So Unconditional call to the
netif_wake_queue() here is wrong.  This might cause calling of
start_xmit routine on txfull state and trigger BUG_ON.

This bug does not happen when NAPI disabled.  After txdone there
must be at least one free tx slot.  But with NAPI, this is not
true anymore and the BUG_ON can hits on heavy load.

In this driver NAPI was enabled on 2.6.33-rc1 so this is
regression from 2.6.32 kernel.

Reported-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agocdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
Torgny Johansson [Fri, 19 Feb 2010 01:59:15 +0000 (01:59 +0000)]
cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)

This patch adds a new vid/pid to the cdc_ether whitelist.

Device added:
- Ericsson Mobile Broadband variant C3607w

Signed-off-by: Torgny Johansson <torgny.johansson@gmail.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoIPv6: better document max_addresses parameter
Brian Haley [Mon, 22 Feb 2010 12:27:21 +0000 (12:27 +0000)]
IPv6: better document max_addresses parameter

Andrew Morton wrote:
>> >From ip-sysctl.txt file in kernel documentation I can see following description
>> for max_addresses:
>> max_addresses - INTEGER
>>         Number of maximum addresses per interface.  0 disables limitation.
>>         It is recommended not set too large value (or 0) because it would
>>         be too easy way to crash kernel to allow to create too much of
>>         autoconfigured addresses.
           ^^^^^^^^^^^^^^

>> If this parameter applies only for auto-configured IP addressed, please state
>> it more clearly in docs or rename the parameter to show that it refers to
>> auto-configuration.

It did mention autoconfigured in the text, but the below makes it more obvious.

More clearly document IPv6 max_addresses parameter.

Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoMAINTAINERS: update mv643xx_eth maintenance status
Lennert Buytenhek [Mon, 22 Feb 2010 22:34:54 +0000 (22:34 +0000)]
MAINTAINERS: update mv643xx_eth maintenance status

I am no longer with Marvell.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoe1000: Fix DMA mapping error handling on RX
Anton Blanchard [Fri, 19 Feb 2010 17:54:53 +0000 (17:54 +0000)]
e1000: Fix DMA mapping error handling on RX

Check for error return from pci_map_single/pci_map_page and clean up.

With this and the previous patch the driver was able to handle a significant
percentage of errors (I set the fault injection rate to 10% and could still
download large files at a reasonable speed).

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoRevert "block: improve queue_should_plug() by looking at IO depths"
Jens Axboe [Tue, 23 Feb 2010 07:40:43 +0000 (08:40 +0100)]
Revert "block: improve queue_should_plug() by looking at IO depths"

This reverts commit fb1e75389bd06fd5987e9cda1b4e0305c782f854.

"Benjamin S." <sbenni@gmx.de> reports that the patch in question
causes a big drop in sequential throughput for him, dropping from
200MB/sec down to only 70MB/sec.

Needs to be investigated more fully, for now lets just revert the
offending commit.

Conflicts:

include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
14 years agodrm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
Thomas Hellstrom [Sun, 21 Feb 2010 14:54:55 +0000 (14:54 +0000)]
drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.

Intercept query commands and apply relocations to their guest pointers.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agoMerge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
Dave Airlie [Tue, 23 Feb 2010 05:42:18 +0000 (15:42 +1000)]
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: fix vram ptes on IGPs to point at stolen system memory
  drm/nv50: fix instmem binding on IGPs to point at stolen system memory
  drm/nv50: improve vram page table construction
  drm/nv50: more efficient clearing of gpu page table entries
  drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
  drm/nouveau: Fix up pre-nv17 analog load detection.

14 years agoMerge branch 'pcc' into release
Len Brown [Tue, 23 Feb 2010 05:39:00 +0000 (00:39 -0500)]
Merge branch 'pcc' into release

14 years agoMerge branches 'bugzilla-14207' and 'idle' into release
Len Brown [Tue, 23 Feb 2010 05:19:48 +0000 (00:19 -0500)]
Merge branches 'bugzilla-14207' and 'idle' into release

14 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Tue, 23 Feb 2010 03:51:39 +0000 (19:51 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: BCM47xx: Fix 128MB RAM support
  MIPS: Highmem: Fix build error

14 years agoMerge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Tue, 23 Feb 2010 03:51:13 +0000 (19:51 -0800)]
Merge branch 'parisc/tracehook' of git://git./linux/kernel/git/frob/linux-2.6-roland

* 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  Revert "parisc: HAVE_ARCH_TRACEHOOK"

14 years agofs/exec.c: fix initial stack reservation
Michael Neuling [Mon, 22 Feb 2010 20:44:24 +0000 (12:44 -0800)]
fs/exec.c: fix initial stack reservation

803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial
stack space expansion to rlimit") attempts to limit the initial stack to
20*PAGE_SIZE.  Unfortunately, in attempting ensure the stack is not
reduced in size, we ended up not changing the stack at all.

This size reduction check is not necessary as the expand_stack call does
this already.

This caused a regression in UML resulting in most guest processes being
killed.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jouni Malinen <j@w1.fi>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>