linux.git/drivers/staging, branch v3.13-rc7

imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()

2013-12-18T01:12:55+00:00

We must not add more CRTCs than we have declared to the vblank
helpers, otherwise we overflow their arrays.  Force failure if we
exceed the number of CRTCs.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: imx-drm-core: make imx_drm_crtc_register() safer

2013-12-18T01:12:55+00:00

imx_drm_crtc_register() doesn't clean up the CRTC upon failure, which
leaves the CRTC attached to the DRM device.  Also, it does setup after
attaching the CRTC to the DRM device.

Fix this by reordering the function such that we do the setup before
drm_crtc_init(): this fixes both issues.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: imx-drm-core: use defined constant for number of CRTCs.

2013-12-18T01:12:55+00:00

We have this definition, there's no reason not to use it.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: imx-tve: don't call sleeping functions beneath enable_lock spinlock

2013-12-18T01:12:55+00:00

Enable lock claims that it is serializing tve_enable/disable calls.
However, DRM already serialises mode sets with a mutex, which prevents
encoder/connector functions being called concurrently.  Secondly,
holding a spinlock while calling clk_prepare_enable() is wrong; it
will cause a might_sleep() warning should that debugging be enabled.
So, let's just get rid of the enable_lock.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: ipu-v3: fix potential CRTC device registration race

2013-12-18T01:11:39+00:00

Clean up the IPUv3 CRTC device registration; we don't need a separate
function just to call platform_device_register_data(), and we don't
need the return value converted at all.

Update the IPU client id under a mutex, so that parallel probing
doesn't race.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: imx-drm-core: fix DRM cleanup paths

2013-12-18T01:09:52+00:00

We must call drm_vblank_cleanup() on the error cleanup and unload paths
after we've had a successful call to drm_vblank_init().  Ensure that
the calls are in the reverse order to the initialisation order.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

imx-drm: imx-drm-core: fix error cleanup path for imx_drm_add_crtc()

2013-12-18T01:09:51+00:00

imx_drm_add_crtc() was kfree'ing the imx_drm_crtc structure while
leaving it on the list of CRTCs.  Delete it from the list first.

Signed-off-by: Russell King 
Acked-by: Sascha Hauer 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: fix return value of comedi_load_firmware()

2013-12-17T21:05:53+00:00

Some of the callback functions that upload the firmware in the comedi
drivers return a positive value indicating the number of bytes sent
to the device. Detect this condition and just return '0' to indicate
a successful upload.

Reported-by: Bernd Porr 
Signed-off-by: H Hartley Sweeten 
Acked-by: Ian Abbott 
Acked-by: Dan Carpenter 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: 8255_pci: fix for newer PCI-DIO48H

2013-12-17T21:05:53+00:00

At some point, Measurement Computing / ComputerBoards redesigned the
PCI-DIO48H to use a PLX PCI interface chip instead of an AMCC chip.
This meant they had to put their hardware registers in the PCI BAR 2
region instead of PCI BAR 1.  Unfortunately, they kept the same PCI
device ID for the new design.  This means the driver recognizes the
newer cards, but doesn't work (and is likely to screw up the local
configuration registers of the PLX chip) because it's using the wrong
region.

Since  the PCI subvendor and subdevice IDs were both zero on the old
design, but are the same as the vendor and device on the new design, we
can tell the old design and new design apart easily enough.  Split the
existing entry for the PCI-DIO48H in `pci_8255_boards[]` into two new
entries, referenced by different entries in the PCI device ID table
`pci_8255_pci_table[]`.  Use the same board name for both entries.

Signed-off-by: Ian Abbott 
Cc: stablle  # 3.10.y # 3.11.y # 3.12.y # 3.13.y
Acked-by: H Hartley Sweeten 
Signed-off-by: Greg Kroah-Hartman

staging:iio:mag:hmc5843 fix incorrect endianness of channel as a result of missuse of the IIO_ST macro.

2013-12-17T20:32:52+00:00

This driver sets the shift value equal to IIO_BE (or 1) rather than setting
that to 0 and specificying the endianness.  This means the channel type is
missreported as
[be|le]:u16/16>>1 where the be|le is dependent on the cpu native endianness,
rather than
be:u16/16>>0 resulting in any userspace code using this information, miss
converting the channel and generating thoroughly trashed data.

Signed-off-by: Jonathan Cameron 
Acked-by: Lars-Peter Clausen 
Cc: stable@vger.kernel.org