summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-17staging: comedi: das1800: introduce struct das1800_dma_descH Hartley Sweeten
For aesthetics, introduce a struct to hold the DMA descriptor data. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: comedi: das1800: separate AI FIFO bounce buffer from DMA bufferH Hartley Sweeten
This driver can use DMA or the hardware FIFO to read analog input samples. When DMA is enabled it's also possible for some async commands to cause DMA to be disabled and the FIFO is used instead. Currently the first DMA channels buffer is used for the bounce buffer when using the FIFO. For aesthetics, add a new member to the private data and use that for the FIFO bounce buffer. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: comedi: das1800: reduce indent level of das1800_init_dma()H Hartley Sweeten
An IRQ and at least one DMA channel are required to use DMA with this driver. Move the check to the caller to reduce the indent level of this function. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: comedi: adl_pci9118: remove VIRT_TO_BUS dependancyH Hartley Sweeten
This driver no longer uses virt_to_bus(). Remove the dependancy. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8192u: Remove check of ieee in rtl819x_BAProc.cVaishali Thakkar
This patch fixes following smatch warning: drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c:117 ieee80211_ADDBA() warn: variable dereferenced before check 'ieee' (see line 114) As ieee can not be NULL at this point, all such checks are removed. Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: Fix duplicated conditional branchAlexander Kuleshov
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17drivers: staging: rtl8192u driver cleanupRene Kolarik
Correct redundant initialization reported by sparse Signed-off-by: Rene Kolarik <rene.kolarik@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8712: remove spaces before commasMax Perepelitsyn
checkpatch.pl fix for ERROR: space prohibited before that ',' (ctx:WxE) Signed-off-by: Max Perepelitsyn <mperepelitsyn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: fixed a space coding style issueGangadhar Vukkesala
Fixed a space coding style issue in 3-dimensional array initialization which was found when running checkpatch.pl script on rtl819x_HTProc.c. Signed-off-by: Gangadhar Vukkesala <gangs.freelancer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtllib_rx.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: update_ibss_network() rtllib_SignalStrengthTranslate() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtl8192e: rtl_pm.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: rtl8192E_save_state() rtl8192E_enable_wake() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8188eu: core: rtw_mlme_ext.c: Remove unused functionRickard Strandqvist
Remove the function NULL_hdl() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8712: rtl871x_mp_ioctl.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: oid_rt_pro_h2c_get_rate_table_hdl() oid_rt_pro_h2c_set_rate_table_hdl() oid_rt_pro_set_pwrstate_hdl() oid_rt_pro_qry_pwrstate_hdl() oid_rt_pro_set_basic_rate_hdl() oid_rt_pro_set_power_tracking_hdl() oid_rt_pro_set_data_rate_ex_hdl() oid_rt_pro_cfg_debug_message_hdl() oid_rt_poll_rx_status_hdl() oid_rt_pro_set_rf_intfs_hdl() oid_rt_wr_attrib_mem_hdl() oid_rt_rd_attrib_mem_hdl() oid_rt_pro8711_pkt_loss_hdl() oid_rt_pro8711_wi_poll_hdl() oid_rt_pro_write16_eeprom_hdl() oid_rt_pro_read16_eeprom_hdl() oid_rt_pro_write_txcmd_hdl() oid_rt_pro_burst_write_register_hdl() oid_rt_pro_burst_read_register_hdl() oid_rt_pro8711_join_bss_hdl() oid_rt_pro_set_pkt_test_mode_hdl() oid_rt_pro_set_tx_agc_offset_hdl() oid_rt_set_crystal_cap_hdl() oid_rt_pro_rw_efuse_pgpkt_hdl() oid_rt_pro_rx_packet_type_hdl() oid_rt_pro_query_dr_variable_hdl() oid_rt_pro_dele_sta_info_hdl() oid_rt_pro_add_sta_info_hdl() oid_rt_pro_encryption_ctrl_hdl() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8192u: removed an unnecessary else statementKarthik Nayak
As per checkpatch warning, removed an unnecessary else statement proceeding an if statement with a return. Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtl8192e: rtl_cam.c: Remove unused functionRickard Strandqvist
Remove the function CAM_read_entry() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8188eu: os_dep: usb_ops_linux.c: Remove unused functionRickard Strandqvist
Remove the function usb_writeN() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8188eu: hal: rtl8188e_hal_init.c: Remove unused functionRickard Strandqvist
Remove the function GetEEPROMSize8188E() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8188eu: hal: rtl8188e_cmd.c: Remove unused functionRickard Strandqvist
Remove the function rtl8188e_set_rssi_cmd() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8192u : fix space before , coding style issue in r8190_rtl8256.cMohammad Jamal
This is a patch to r8190_rtl8256.c file that fixes space before , warning found by checkpatch.pl tool Signed-off-by: Mohammad Jamal<md.jamalmohiuddin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rejoin split quoted stringsJonathan Jin
Fix a checkpatch.pl warning regarding quoted string splits across lines. While each join of these quoted strings results in a new checkpatch.pl "lines over 80 characters" warning, the regained ability to grep for these log strings in the codebase is, I would argue, well worth the trade-off. Signed-off-by: Jonathan Jin <jjin082693@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8188eu: Fixed a space coding style issue.Gangadhar Vukkesala
Fixed a space coding style issue which was found when running checkpatch.pl script on rtw_ap.c. Signed-off-by: Gangadhar Vukkesala <gangs.freelancer@gmail.com> Reviewed-by: Jeremiah Mahler <jmmahler@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8188eu: {core, hal, include}: Removed inline functionAbel Moyo
Removed inline function get_my_bssid and open coded all its references Signed-off-by: Abel Moyo <abelmoyo.ab@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: fix sparse warningAlexey Tulia
drivers/staging/rtl8723au/core/rtw_xmit.c:2375 warning: symbol 'rtw_ack_tx_done23a' was not declared. Should it be static? Function 'rtw_ack_tx_done23a' seems to be unused in current staging code. Signed-off-by: Alexey Tulia <alexey.tulia@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: hal: odm.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: odm_1R_CCA23a() odm_TXPowerTrackingCheckAP() odm_TXPowerTrackingCheckMP() odm_RSSIMonitorCheck23aAP() odm_RSSIMonitorCheck23aMP() odm_RSSIMonitorInit() odm_RefreshRateAdaptiveMask23aAPADSL23a() odm_RefreshRateAdaptiveMask23aMP23a() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8723au: core: rtw_ap: checkpatch.pl fixesJoe Borg
Fixing styling errors found with checkpatch.pl. These include: "(foo*)" should be "(foo *)" space required after that ';' ...totalling 5 styling errors. Signed-off-by: Joe Borg <joe@josephb.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Fix sparse invalid assignment warningsYannis Damigos
This is a patch to the hal/rtl8723au_xmit.c file that fixes the following warnings found by sparse tool: drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:88:22: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:88:22: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:88:22: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:91:22: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:91:22: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:91:22: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:99:22: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:99:22: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:99:22: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:103:30: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:103:30: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:103:30: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:106:38: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:106:38: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:106:38: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:108:38: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:108:38: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:108:38: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:112:38: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:112:38: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:112:38: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:120:22: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:120:22: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:120:22: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:123:30: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:123:30: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:123:30: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:125:30: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:125:30: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:125:30: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:129:30: warning: invalid assignment: |= drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:129:30: left side has type unsigned int drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:129:30: right side has type restricted __le32 drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:184:51: warning: incorrect type in argument 2 (different base types) drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:184:51: expected unsigned int [usertype] *pdw drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:184:51: got restricted __le32 *<noident> drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:185:51: warning: incorrect type in argument 2 (different base types) drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:185:51: expected unsigned int [usertype] *pdw drivers/staging/rtl8723au//hal/rtl8723au_xmit.c:185:51: got restricted __le32 *<noident> Signed-off-by: Yannis Damigos <giannis.damigos@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: core: fixing "foo * bar" should be "foo *bar"Asaf Vertz
Fixed a coding style error, "foo * bar" should be "foo *bar" Signed-off-by: Asaf Vertz <asaf.vertz@tandemg.com> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Fix sparse warningsKrzysztof Konopko
Some struct fields in wifi.h are meant to be __le16 but were declared as unsigned short. This was reported by sparse: rtw_wlan_util.c:538:24: warning: cast to restricted __le16 rtw_wlan_util.c:1544:29: warning: cast to restricted __le16 rtw_wlan_util.c:1546:25: warning: cast to restricted __le16 This patch updates the types of the fields in `AC_param` and `ADDBA_request` structs to be consistent with relevant structs in include/linux/ieee80211.h. Signed-off-by: Krzysztof Konopko <kris@konagma.com> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17Staging: rtl8723au: os_dep: Fixed a coding style issue.Dean Michael Ancajas
Fixed a coding style issue for braces. Signed-off-by: Dean Michael Ancajas <dbancajas@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: hal: Removed a space before semicolonAnjana Sasindran
This patch fix the checkpatch.pl warning: WARNING: space before semicolon prohibited Signed-off-by: Anjana Sasindran <anjanasasindran123@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: hal: Removed space before semicolonAnjana Sasindran
This patch fix the checkpatch.pl warning: WARNING: spaces prohibited before semicolon Signed-off-by: Anjana Sasindran <anjanasasindran123@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: hal: Added blank line after declarationAnjana Sasindran
This patch fix the checkpatch.pl warning: WARNING: Missing blank line after declaration Signed-off-by: Anjana Sasindran <anjanasasindran123@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17drivers: staging: rtl8723au: Fix "'foo * bar' should be 'foo *bar'" errorsGreg Donald
Fix checkpatch.pl "'foo * bar' should be 'foo *bar'" errors Signed-off-by: Greg Donald <gdonald@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Hal8723PwrSeq.h: Use BIT() define to match mask valueJes Sorensen
This is a no-op change, but it improves consistency. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Hal8723PwrSeq.h: Remove SDIO specific entriesJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Hal8723PwrSeq.h: Remove PCI specific entries from the ↵Jes Sorensen
power sequence tables Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: HalPwrSeqCmdParsing23a(): Avoid unnecessary variable initsJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Hal8723APhyCfg.h: Remove more unused #definesJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: There is no 11N pseudo PHY hereJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Baseband is always configured through PHY regsJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Hal8723APhyCfg.h: Remove some undefined structs and enumsJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Use enum for counter and avoid ugly typecastJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Use proper enum definesJes Sorensen
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: Use correct register names to set parameters to reduce ↵Jes Sorensen
80M spur Use the correct register names when setting parameters to reduce 80M spur. In addition apply updated 80M spur reduction parameters. Original patch supplied by Andrew Chang <andrew.chang@realtek.com> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8723au: usb_dvobj_init(): A NULL pointer check for ↵Jes Sorensen
usb_host_endpoints makes no sense struct usb_host_interface points to an array of struct usb_host_endpoints - it makes no sense to do a NULL pointer check for each pointer. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17clk: fix possible null pointer dereferenceStanimir Varbanov
The commit 646cafc6 (clk: Change clk_ops->determine_rate to return a clk_hw as the best parent) opens a possibility for null pointer dereference, fix this. Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Michael Turquette <mturquette@linaro.org>
2015-01-17Revert "clk: ppc-corenet: Fix Section mismatch warning"Kevin Hao
This reverts commit da788acb28386aa896224e784954bb73c99ff26c. That commit tried to fix the section mismatch warning by moving the ppc_corenet_clk_driver struct to init section. This is definitely wrong because the kernel would free the memories occupied by this struct after boot while this driver is still registered in the driver core. The kernel would panic when accessing this driver struct. Cc: stable@vger.kernel.org # 3.17 Signed-off-by: Kevin Hao <haokexin@gmail.com> Acked-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Michael Turquette <mturquette@linaro.org>
2015-01-17clk: rockchip: fix deadlock possibility in cpuclkHeiko Stübner
Lockdep reported a possible deadlock between the cpuclk lock and for example the i2c driver. CPU0 CPU1 ---- ---- lock(clk_lock); local_irq_disable(); lock(&(&i2c->lock)->rlock); lock(clk_lock); <Interrupt> lock(&(&i2c->lock)->rlock); *** DEADLOCK *** The generic clock-types of the core ccf already use spin_lock_irqsave when touching clock registers, so do the same for the cpuclk. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Michael Turquette <mturquette@linaro.org> [mturquette@linaro.org: removed initialization of "flags"]
2015-01-18Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds
Pull dmaengine fixes from Vinod Koul: "Two patches, the first by Andy to fix dw dmac runtime pm and second one by me to fix the dmaengine headers in MAINTAINERS" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: dw: balance PM runtime calls MAINTAINERS: dmaengine: fix the header file for dmaengine
2015-01-18Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "Mostly tooling fixes, but also two PMU driver fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf tools powerpc: Use dwfl_report_elf() instead of offline. perf tools: Fix segfault for symbol annotation on TUI perf test: Fix dwarf unwind using libunwind. perf tools: Avoid build splat for syscall numbers with uclibc perf tools: Elide strlcpy warning with uclibc perf tools: Fix statfs.f_type data type mismatch build error with uclibc tools: Remove bitops/hweight usage of bits in tools/perf perf machine: Fix __machine__findnew_thread() error path perf tools: Fix building error in x86_64 when dwarf unwind is on perf probe: Propagate error code when write(2) failed perf/x86/intel: Fix bug for "cycles:p" and "cycles:pp" on SLM perf/rapl: Fix sysfs_show() initialization for RAPL PMU