linux-toradex.git/drivers, branch v3.12.36

mfd: viperboard: Fix platform-device id collision

2015-01-09T10:28:28+00:00

commit b6684228726cc25551a43f5c0bd9c5f977f10f48 upstream.

Allow more than one viperboard to be connected by registering with
PLATFORM_DEVID_AUTO instead of PLATFORM_DEVID_NONE.

The subdevices are currently registered with PLATFORM_DEVID_NONE, which
will cause a name collision on the platform bus when a second viperboard
is plugged in:

viperboard 1-2.4:1.0: version 0.00 found at bus 001 address 004
------------[ cut here ]------------
WARNING: CPU: 0 PID: 181 at /home/johan/work/omicron/src/linux/fs/sysfs/dir.c:31 sysfs_warn_dup+0x74/0x84()
sysfs: cannot create duplicate filename '/bus/platform/devices/viperboard-gpio'
Modules linked in: i2c_viperboard viperboard netconsole [last unloaded: viperboard]
CPU: 0 PID: 181 Comm: bash Tainted: G        W      3.17.0-rc6 #1
[] (unwind_backtrace) from [] (show_stack+0x20/0x24)
[] (show_stack) from [] (dump_stack+0x24/0x28)
[] (dump_stack) from [] (warn_slowpath_common+0x80/0x98)
[] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x40/0x48)
[] (warn_slowpath_fmt) from [] (sysfs_warn_dup+0x74/0x84)
[] (sysfs_warn_dup) from [] (sysfs_do_create_link_sd.isra.2+0xcc/0xd0)
[] (sysfs_do_create_link_sd.isra.2) from [] (sysfs_create_link+0x3c/0x48)
[] (sysfs_create_link) from [] (bus_add_device+0x12c/0x1e0)
[] (bus_add_device) from [] (device_add+0x410/0x584)
[] (device_add) from [] (platform_device_add+0xd8/0x26c)
[] (platform_device_add) from [] (mfd_add_device+0x240/0x344)
[] (mfd_add_device) from [] (mfd_add_devices+0xb8/0x110)
[] (mfd_add_devices) from [] (vprbrd_probe+0x160/0x1b0 [viperboard])
[] (vprbrd_probe [viperboard]) from [] (usb_probe_interface+0x1bc/0x2a8)
[] (usb_probe_interface) from [] (driver_probe_device+0x14c/0x3ac)
[] (driver_probe_device) from [] (__driver_attach+0xa4/0xa8)
[] (__driver_attach) from [] (bus_for_each_dev+0x70/0xa4)
[] (bus_for_each_dev) from [] (driver_attach+0x2c/0x30)
[] (driver_attach) from [] (usb_store_new_id+0x170/0x1ac)
[] (usb_store_new_id) from [] (new_id_store+0x34/0x3c)
[] (new_id_store) from [] (drv_attr_store+0x30/0x3c)
[] (drv_attr_store) from [] (sysfs_kf_write+0x5c/0x60)
[] (sysfs_kf_write) from [] (kernfs_fop_write+0xd4/0x194)
[] (kernfs_fop_write) from [] (vfs_write+0xb4/0x1c0)
[] (vfs_write) from [] (SyS_write+0x4c/0xa0)
[] (SyS_write) from [] (ret_fast_syscall+0x0/0x48)
---[ end trace 98e8603c22d65817 ]---
viperboard 1-2.4:1.0: Failed to add mfd devices to core.
viperboard: probe of 1-2.4:1.0 failed with error -17

Signed-off-by: Johan Hovold 
Signed-off-by: Lee Jones 
Signed-off-by: Jiri Slaby

mfd: stmpe: Fix STMPE24xx GPMR LSB

2015-01-09T10:28:27+00:00

commit 871c3cf4ea7d5baf58e0a40bce7431ca5525aa2a upstream.

The least significat byte of the GPIO value read register
on the STMPE24xx series is on addres 0xA4 not 0xA5. Correct
against datasheet and tested on the STMPE2401 hardware.

Signed-off-by: Linus Walleij 
Signed-off-by: Lee Jones 
Signed-off-by: Jiri Slaby

thermal: Fix error path in thermal_init()

2015-01-07T16:55:08+00:00

commit 9d367e5e7b05c71a8c1ac4e9b6e00ba45a79f2fc upstream.

thermal_unregister_governors() and class_unregister() were being called in
the wrong order.

Fixes: 80a26a5c22b9 ("Thermal: build thermal governors into thermal_sys module")
Signed-off-by: Luis Henriques 
Signed-off-by: Zhang Rui 
Signed-off-by: Jiri Slaby

dm space map metadata: fix sm_bootstrap_get_nr_blocks()

2015-01-07T15:24:10+00:00

commit c1c6156fe4d4577444b769d7edd5dd503e57bbc9 upstream.

This function isn't right and it causes a static checker warning:

	drivers/md/dm-thin.c:3016 maybe_resize_data_dev()
	error: potentially using uninitialized 'sb_data_size'.

It should set "*count" and return zero on success the same as the
sm_metadata_get_nr_blocks() function does earlier.

Fixes: 3241b1d3e0aa ('dm: add persistent data library')
Signed-off-by: Dan Carpenter 
Acked-by: Joe Thornber 
Signed-off-by: Mike Snitzer 
Signed-off-by: Jiri Slaby

dm bufio: fix memleak when using a dm_buffer's inline bio

2015-01-07T15:24:10+00:00

commit 445559cdcb98a141f5de415b94fd6eaccab87e6d upstream.

When dm-bufio sets out to use the bio built into a struct dm_buffer to
issue an IO, it needs to call bio_reset after it's done with the bio
so that we can free things attached to the bio such as the integrity
payload.  Therefore, inject our own endio callback to take care of
the bio_reset after calling submit_io's end_io callback.

Test case:
1. modprobe scsi_debug delay=0 dif=1 dix=199 ato=1 dev_size_mb=300
2. Set up a dm-bufio client, e.g. dm-verity, on the scsi_debug device
3. Repeatedly read metadata and watch kmalloc-192 leak!

Signed-off-by: Darrick J. Wong 
Signed-off-by: Mikulas Patocka 
Signed-off-by: Mike Snitzer 
Signed-off-by: Jiri Slaby

scsi: correct return values for .eh_abort_handler implementations

2015-01-07T15:24:09+00:00

commit b6c92b7e0af575e2b8b05bdf33633cf9e1661cbf upstream.

The .eh_abort_handler needs to return SUCCESS, FAILED, or
FAST_IO_FAIL. So fixup all callers to adhere to this requirement.

Reviewed-by: Robert Elliott 
Signed-off-by: Hannes Reinecke 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Jiri Slaby

megaraid_sas: corrected return of wait_event from abort frame path

2015-01-07T15:24:08+00:00

commit 170c238701ec38b1829321b17c70671c101bac55 upstream.

Corrected wait_event() call which was waiting for wrong completion
status (0xFF).

Signed-off-by: Sumit Saxena 
Signed-off-by: Kashyap Desai 
Reviewed-by: Tomas Henzl 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Jiri Slaby

mmc: block: add newline to sysfs display of force_ro

2015-01-07T15:24:07+00:00

commit 0031a98a85e9fca282624bfc887f9531b2768396 upstream.

Make force_ro consistent with other sysfs entries.

Fixes: 371a689f64b0d ('mmc: MMC boot partitions support')
Cc: Andrei Warkentin 
Signed-off-by: Baruch Siach 
Signed-off-by: Ulf Hansson 
Signed-off-by: Jiri Slaby

mfd: tc6393xb: Fail ohci suspend if full state restore is required

2015-01-07T15:24:07+00:00

commit 1a5fb99de4850cba710d91becfa2c65653048589 upstream.

Some boards with TC6393XB chip require full state restore during system
resume thanks to chip's VCC being cut off during suspend (Sharp SL-6000
tosa is one of them). Failing to do so would result in ohci Oops on
resume due to internal memory contentes being changed. Fail ohci suspend
on tc6393xb is full state restore is required.

Recommended workaround is to unbind tmio-ohci driver before suspend and
rebind it after resume.

Signed-off-by: Dmitry Eremin-Solenikov 
Signed-off-by: Lee Jones 
Signed-off-by: Jiri Slaby

igb: bring link up when PHY is powered up

2015-01-07T15:20:16+00:00

commit aec653c43b0c55667355e26d7de1236bda9fb4e3 upstream.

Call igb_setup_link() when the PHY is powered up.

Signed-off-by: Todd Fujinaka 
Reported-by: Jeff Westfahl 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher 
Cc: Vincent Donnefort 
Signed-off-by: Jiri Slaby