f3cbfa5d6e
Misc: sram: Remove unneeded check
...
Patch removes unneeded check for resource since
devm_ioremap_resource do all for us.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-17 16:41:49 -07:00
0e496b8e84
Merge 3.10-rc6 into char-misc-next
...
We want the fixes in here.
2013-06-17 11:54:25 -07:00
06b753d6fd
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
2013-06-17 17:20:15 +01:00
9bb92855e3
Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
...
Pull char / misc fixes from Greg Kroah-Hartman:
"Here are some small mei driver fixes for 3.10-rc6 that fix some
reported problems"
* tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mei: me: clear interrupts on the resume path
mei: nfc: fix nfc device freeing
mei: init: Flush scheduled work before resetting the device
2013-06-14 19:15:36 -10:00
f0b76558cf
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
...
This typedef is unnecessary and should just be removed.
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Robin Holt <holt@sgi.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2013-06-14 10:19:25 +02:00
42f132febf
mei: me: clear interrupts on the resume path
...
We need to clear pending interrupts on the resume
path. This brings the device into defined state
before starting the reset flow
This should solve suspend/resume issues:
mei_me : wait hw ready failed. status = 0x0
mei_me : version message write failed
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-13 22:31:07 -07:00
2753ff53d4
mei: nfc: fix nfc device freeing
...
The nfc_dev is a static variable and is not cleaned properly upon reset
mainly ndev->cl and ndev->cl_info are not set to NULL after freeing which
mei_stop:198: mei_me 0000:00:16.0: stopping the device.
[ 404.253427] general protection fault: 0000 [#2 ] SMP
[ 404.253437] Modules linked in: mei_me(-) binfmt_misc snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device edd af_packet cpufreq_conservative cpufreq_userspace cpufreq_powersave fuse loop dm_mod hid_generic usbhid hid coretemp acpi_cpufreq mperf kvm_intel kvm crc32c_intel ghash_clmulni_intel aesni_intel ablk_helper cryptd lrw gf128mul snd_hda_codec_hdmi glue_helper aes_x86_64 e1000e snd_hda_intel snd_hda_codec ehci_pci iTCO_wdt iTCO_vendor_support ehci_hcd snd_hwdep xhci_hcd snd_pcm usbcore ptp mei sg microcode snd_timer pps_core i2c_i801 snd pcspkr battery rtc_cmos lpc_ich mfd_core soundcore usb_common snd_page_alloc ac ext3 jbd mbcache drm_kms_helper drm intel_agp i2c_algo_bit intel_gtt i2c_core sd_mod crc_t10dif thermal fan video button processor thermal_sys hwmon ahci libahci libata scsi_mod [last unloaded: mei_me]
[ 404.253591] CPU: 0 PID: 5551 Comm: modprobe Tainted: G D W 3.10.0-rc3 #1
[ 404.253611] task: ffff880143cd8300 ti: ffff880144a2a000 task.ti: ffff880144a2a000
[ 404.253619] RIP: 0010:[<ffffffff81334e5d>] [<ffffffff81334e5d>] device_del+0x1d/0x1d0
[ 404.253638] RSP: 0018:ffff880144a2bcf8 EFLAGS: 00010206
[ 404.253645] RAX: 2020302e30202030 RBX: ffff880144fdb000 RCX: 0000000000000086
[ 404.253652] RDX: 0000000000000001 RSI: 0000000000000086 RDI: ffff880144fdb000
[ 404.253659] RBP: ffff880144a2bd18 R08: 0000000000000651 R09: 0000000000000006
[ 404.253666] R10: 0000000000000651 R11: 0000000000000006 R12: ffff880144fdb000
[ 404.253673] R13: ffff880149371098 R14: ffff880144482c00 R15: ffffffffa04710e0
[ 404.253681] FS: 00007f251c59a700(0000) GS:ffff88014e200000(0000) knlGS:0000000000000000
[ 404.253689] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 404.253696] CR2: ffffffffff600400 CR3: 0000000145319000 CR4: 00000000001407f0
[ 404.253703] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 404.253710] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 404.253716] Stack:
[ 404.253720] ffff880144fdb000 ffff880143ffe000 ffff880149371098 ffffffffa0471000
[ 404.253732] ffff880144a2bd38 ffffffff8133502d ffff88014e20cf48 ffff880143ffe1d8
[ 404.253744] ffff880144a2bd48 ffffffffa02a4749 ffff880144a2bd58 ffffffffa02a4ba1
[ 404.253755] Call Trace:
[ 404.253766] [<ffffffff8133502d>] device_unregister+0x1d/0x60
[ 404.253787] [<ffffffffa02a4749>] mei_cl_remove_device+0x9/0x10 [mei]
[ 404.253804] [<ffffffffa02a4ba1>] mei_nfc_host_exit+0x21/0x30 [mei]
[ 404.253819] [<ffffffffa029c2dd>] mei_stop+0x3d/0x90 [mei]
[ 404.253830] [<ffffffffa046e220>] mei_me_remove+0x60/0xe0 [mei_me]
[ 404.253843] [<ffffffff81278f37>] pci_device_remove+0x37/0xb0
[ 404.253855] [<ffffffff81337c68>] __device_release_driver+0x98/0x100
[ 404.253865] [<ffffffff81337d80>] driver_detach+0xb0/0xc0
[ 404.253876] [<ffffffff81336b4f>] bus_remove_driver+0x8f/0x120
[ 404.253891] [<ffffffff81075990>] ? try_to_wake_up+0x2b0/0x2b0
[ 404.253903] [<ffffffff81338a48>] driver_unregister+0x58/0x90
[ 404.253913] [<ffffffff8127906b>] pci_unregister_driver+0x2b/0xb0
[ 404.253924] [<ffffffffa046f244>] mei_me_driver_exit+0x10/0xdcc [mei_me]
[ 404.253936] [<ffffffff810a50d8>] SyS_delete_module+0x198/0x2b0
[ 404.253949] [<ffffffff814850d9>] ? do_page_fault+0x9/0x10
[ 404.253961] [<ffffffff81489692>] system_call_fastpath+0x16/0x1b
[ 404.253967] Code: 41 5c 41 5d 41 5e 41 5f c9 c3 0f 1f 40 00 55 48 89 e5 41 56 41 55 41 54 49 89 fc 53 48 8b 87 88 00 00 00 4c 8b 37 48 85 c0 74 18 <48> 8b 78 78 4c 89 e2 be 02 00 00 00 48 81 c7 f8 00 00 00 e8 3b
[ 404.254048] RIP [<ffffffff81334e5d>] device_del+0x1d/0x1d0
Cc: Samuel Ortiz <sameo@linux.intel.com >
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-13 22:31:06 -07:00
5e85b36448
mei: init: Flush scheduled work before resetting the device
...
Flushing pending work items before resetting the device makes more
sense than doing so afterwards. Some of them, like e.g. the NFC
initialization one, find themselves with client IDs changed after
the reset, eventually leading to trigger a client.c:mei_me_cl_by_id()
warning after a few modprobe/rmmod cycles.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com >
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-13 22:31:05 -07:00
282c4c0ecc
drivers/misc/sgi-gru/grufile.c: fix info leak in gru_get_config_info()
...
The "info.fill" array isn't initialized so it can leak uninitialized stack
information to user space.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com >
Acked-by: Robin Holt <holt@sgi.com >
Acked-by: Dimitri Sivanich <sivanich@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2013-06-12 16:29:46 -07:00
6f0d94790e
ASoC: atmel-ssc: prepare clk before calling enable
...
Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com >
Signed-off-by: Mark Brown <broonie@linaro.org >
2013-06-07 17:54:17 +01:00
29ddae2a40
pch_phub: fix error return code in pch_phub_probe()
...
Error code had been assigned to retval in some error handling case
but never use it, 0 is always returned in those case, this patch
fix them to return a negative error code.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-06 12:54:08 -07:00
f7b41276b6
misc: replace strict_strtoul() with kstrtoul()
...
The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com >
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-06 12:54:08 -07:00
4cd5773a2a
net: core: move mac_pton() to lib/net_utils.c
...
Since we have at least one user of this function outside of CONFIG_NET
scope, we have to provide this function independently. The proposed
solution is to move it under lib/net_utils.c with corresponding
configuration variable and select wherever it is needed.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com >
Reported-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: David S. Miller <davem@davemloft.net >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-05 12:00:27 -07:00
143e9c76c4
pch_phub: re-use native MAC address parser
...
We have mac_pton() helper to parse MAC addresses.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-03 14:23:32 -07:00
c265a0d515
pcie-gadget-spear: fix error return code in spear_pcie_gadget_probe()
...
Fix to return a negative error code in the clk_get_sys() and clk_enable()
error handling case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-06-03 14:23:32 -07:00
a4b05d1262
misc/ep93xx_pwm: use kstrtol instead of strict_strtol
...
strict_strtol is deprecated in favor of kstrtol.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:07 +09:00
6e1cf66ee3
misc/ep93xx_pwm: use module_platform_driver()
...
Add the (*probe) function to the platform_driver and use the
module_platform_driver() macro to initialize the module.
Remove the unnecessary __init and __exit tags.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:06 +09:00
ddfd6894db
misc/ep93xx_pwm: remove ep93xx_pwm_is_inverted() inline function
...
This is a simple wrapper around readl(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:05 +09:00
5b2cd8f9b4
misc/ep93xx_pwm: remove ep93xx_pwm_is_enabled() inline function
...
This is a simple wrapper around readl(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:05 +09:00
7501ba361f
misc/ep93xx_pwm: remove ep93xx_pwm_read_tc() inline function
...
This is a simple wrapper around readl(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:05 +09:00
d98d7903d1
misc/ep93xx_pwm: remove ep93xx_pwm_normal() inline function
...
This is a simple wrapper around writel(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:04 +09:00
47a36ee95a
misc/ep93xx_pwm: remove ep93xx_pwm_invert() inline function
...
This is a simple wrapper around writel(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:04 +09:00
02846b97d7
misc/ep93xx_pwm: remove ep93xx_pwm_disable() inline function
...
This is a simple wrapper around writel(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:04 +09:00
ac91b96f30
misc/ep93xx_pwm: remove ep93xx_pwm_enable() inline function
...
This is a simple wrapper around writel(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:03 +09:00
aa919769c6
misc/ep93xx_pwm: remove ep93xx_pwm_write_dc() inline function
...
This is a simple wrapper around writel(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Reviewed-by: Ryan Mallon <rmallon@gmail.com >
Cc: Matthieu Crapet <mcrapet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-05-30 21:54:02 +09:00
Alexander Shiyan
Greg Kroah-Hartman
Mark Brown
Linus Torvalds
Joe Perches
Tomas Winkler
Samuel Ortiz
Dan Carpenter
Boris BREZILLON
Wei Yongjun
Jingoo Han
Andy Shevchenko
Andy Shevchenko
H Hartley Sweeten