aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--drivers/input/misc/da9055_onkey.c2
-rw-r--r--drivers/media/dvb-frontends/stv0367.c2
-rw-r--r--drivers/net/ethernet/intel/igb/e1000_phy.c2
-rw-r--r--drivers/s390/char/vmur.c2
-rw-r--r--drivers/scsi/libfc/fc_fcp.c2
-rw-r--r--mm/mmu_notifier.c2
-rw-r--r--sound/pci/hda/hda_codec.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 73e20dba55c1..75789ec41f53 100644
--- a/Makefile
+++ b/Makefile
@@ -794,7 +794,7 @@ PHONY += $(vmlinux-dirs)
794$(vmlinux-dirs): prepare scripts 794$(vmlinux-dirs): prepare scripts
795 $(Q)$(MAKE) $(build)=$@ 795 $(Q)$(MAKE) $(build)=$@
796 796
797# Store (new) KERNELRELASE string in include/config/kernel.release 797# Store (new) KERNELRELEASE string in include/config/kernel.release
798include/config/kernel.release: include/config/auto.conf FORCE 798include/config/kernel.release: include/config/auto.conf FORCE
799 $(Q)rm -f $@ 799 $(Q)rm -f $@
800 $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@ 800 $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index ee6ae3a00174..a0af8b2506ce 100644
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -36,7 +36,7 @@ static void da9055_onkey_query(struct da9055_onkey *onkey)
36 } else { 36 } else {
37 key_stat &= DA9055_NOKEY_STS; 37 key_stat &= DA9055_NOKEY_STS;
38 /* 38 /*
39 * Onkey status bit is cleared when onkey button is relased. 39 * Onkey status bit is cleared when onkey button is released.
40 */ 40 */
41 if (!key_stat) { 41 if (!key_stat) {
42 input_report_key(onkey->input, KEY_POWER, 0); 42 input_report_key(onkey->input, KEY_POWER, 0);
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index 0c8e45949b11..7b6dba3ce55e 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -2919,7 +2919,7 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,
2919 if (tuner_lock == 0) 2919 if (tuner_lock == 0)
2920 return FE_367CAB_NOTUNER; 2920 return FE_367CAB_NOTUNER;
2921#endif 2921#endif
2922 /* Relase the TRL to start demodulator acquisition */ 2922 /* Release the TRL to start demodulator acquisition */
2923 /* Wait for QAM lock */ 2923 /* Wait for QAM lock */
2924 LockTime = 0; 2924 LockTime = 0;
2925 stv0367_writereg(state, R367CAB_CTRL_1, 0x00); 2925 stv0367_writereg(state, R367CAB_CTRL_1, 0x00);
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 115b0da6e013..9979ebcf2a0c 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -2014,7 +2014,7 @@ out:
2014 * Verify the reset block is not blocking us from resetting. Acquire 2014 * Verify the reset block is not blocking us from resetting. Acquire
2015 * semaphore (if necessary) and read/set/write the device control reset 2015 * semaphore (if necessary) and read/set/write the device control reset
2016 * bit in the PHY. Wait the appropriate delay time for the device to 2016 * bit in the PHY. Wait the appropriate delay time for the device to
2017 * reset and relase the semaphore (if necessary). 2017 * reset and release the semaphore (if necessary).
2018 **/ 2018 **/
2019s32 igb_phy_hw_reset(struct e1000_hw *hw) 2019s32 igb_phy_hw_reset(struct e1000_hw *hw)
2020{ 2020{
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c180e3135b3b..64c467998a90 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -89,7 +89,7 @@ static DEFINE_MUTEX(vmur_mutex);
89 * urd references: 89 * urd references:
90 * - ur_probe gets a urd reference, ur_remove drops the reference 90 * - ur_probe gets a urd reference, ur_remove drops the reference
91 * dev_get_drvdata(&cdev->dev) 91 * dev_get_drvdata(&cdev->dev)
92 * - ur_open gets a urd reference, ur_relase drops the reference 92 * - ur_open gets a urd reference, ur_release drops the reference
93 * (urf->urd) 93 * (urf->urd)
94 * 94 *
95 * cdev references: 95 * cdev references:
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 09c81b2f2169..5fd0f1fbe586 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -2043,7 +2043,7 @@ int fc_eh_abort(struct scsi_cmnd *sc_cmd)
2043 spin_unlock_irqrestore(&si->scsi_queue_lock, flags); 2043 spin_unlock_irqrestore(&si->scsi_queue_lock, flags);
2044 return SUCCESS; 2044 return SUCCESS;
2045 } 2045 }
2046 /* grab a ref so the fsp and sc_cmd cannot be relased from under us */ 2046 /* grab a ref so the fsp and sc_cmd cannot be released from under us */
2047 fc_fcp_pkt_hold(fsp); 2047 fc_fcp_pkt_hold(fsp);
2048 spin_unlock_irqrestore(&si->scsi_queue_lock, flags); 2048 spin_unlock_irqrestore(&si->scsi_queue_lock, flags);
2049 2049
diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
index 6725ff183374..93e6089cb456 100644
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -315,7 +315,7 @@ void mmu_notifier_unregister(struct mmu_notifier *mn, struct mm_struct *mm)
315 315
316 /* 316 /*
317 * Wait for any running method to finish, of course including 317 * Wait for any running method to finish, of course including
318 * ->release if it was run by mmu_notifier_relase instead of us. 318 * ->release if it was run by mmu_notifier_release instead of us.
319 */ 319 */
320 synchronize_srcu(&srcu); 320 synchronize_srcu(&srcu);
321 321
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 55108b5fb291..a9676ceafe00 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2523,7 +2523,7 @@ int snd_hda_codec_reset(struct hda_codec *codec)
2523 flush_workqueue(bus->workq); 2523 flush_workqueue(bus->workq);
2524#endif 2524#endif
2525 snd_hda_ctls_clear(codec); 2525 snd_hda_ctls_clear(codec);
2526 /* relase PCMs */ 2526 /* release PCMs */
2527 for (i = 0; i < codec->num_pcms; i++) { 2527 for (i = 0; i < codec->num_pcms; i++) {
2528 if (codec->pcm_info[i].pcm) { 2528 if (codec->pcm_info[i].pcm) {
2529 snd_device_free(card, codec->pcm_info[i].pcm); 2529 snd_device_free(card, codec->pcm_info[i].pcm);