linux-stable.git/drivers/staging, branch v3.13.1

staging: comedi: adl_pci9111: fix incorrect irq passed to request_irq()

2014-01-29T13:06:18+00:00

commit 48108fe3daa0d142f9b97178fdb23704ea3a407b upstream.

The dev->irq passed to request_irq() will always be 0 when the auto_attach
function is called. The pcidev->irq should be used instead to get the correct
irq number.

Signed-off-by: H Hartley Sweeten 
Reviewed-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_1032: fix subdevice type/flags bug

2014-01-29T13:06:18+00:00

commit 90daf69a7a3f1d1a41018c799968a0bb896d65e0 upstream.

The SDF_CMD_READ should be one of the s->subdev_flags not part of
the s->type.

Signed-off-by: H Hartley Sweeten 
Reviewed-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: fix result of memdup_user for user chanlist

2014-01-29T13:06:18+00:00

commit e56b1401056288a725d50942ef300dcbed5e519a upstream.

If the channel list is not set in userspace we get an error at
PTR_ERR(async->cmd.chanlist). However, do_become_nonbusy(dev, s) cleans
up this pointer which causes a kernel ooops. Setting the channel list in
async to NULL and checking this in do_become_nonbusy prevents the oops.

[Ian Abbott] Also do the same for the chanlist allocated in
do_cmdtest_ioctl().

Signed-off-by: Bernd Porr 
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10T18:23:08+00:00

Currently, the tx queue were selected implicitly in ndo_dfwd_start_xmit(). The
will cause several issues:

- NETIF_F_LLTX were removed for macvlan, so txq lock were done for macvlan
  instead of lower device which misses the necessary txq synchronization for
  lower device such as txq stopping or frozen required by dev watchdog or
  control path.
- dev_hard_start_xmit() was called with NULL txq which bypasses the net device
  watchdog.
- dev_hard_start_xmit() does not check txq everywhere which will lead a crash
  when tso is disabled for lower device.

Fix this by explicitly introducing a new param for .ndo_select_queue() for just
selecting queues in the case of l2 forwarding offload. netdev_pick_tx() was also
extended to accept this parameter and dev_queue_xmit_accel() was used to do l2
forwarding transmission.

With this fixes, NETIF_F_LLTX could be preserved for macvlan and there's no need
to check txq against NULL in dev_hard_start_xmit(). Also there's no need to keep
a dedicated ndo_dfwd_start_xmit() and we can just reuse the code of
dev_queue_xmit() to do the transmission.

In the future, it was also required for macvtap l2 forwarding support since it
provides a necessary synchronization method.

Cc: John Fastabend 
Cc: Neil Horman 
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: Jason Wang 
Acked-by: Neil Horman 
Acked-by: John Fastabend 
Signed-off-by: David S. Miller

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