aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/skfp/pmf.c2
-rw-r--r--drivers/s390/block/dasd_eckd.c4
-rw-r--r--security/selinux/ss/services.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index efc639c013fd..ea85de918233 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -575,7 +575,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
575 int sp_len ; 575 int sp_len ;
576 576
577 /* 577 /*
578 * skip if errror 578 * skip if error
579 */ 579 */
580 if (pcon->pc_err) 580 if (pcon->pc_err)
581 return ; 581 return ;
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 418b4e63a4fa..ea63ba7828f9 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -555,7 +555,7 @@ dasd_eckd_read_conf(struct dasd_device *device)
555 if (conf_data == NULL) { 555 if (conf_data == NULL) {
556 MESSAGE(KERN_WARNING, "%s", "No configuration " 556 MESSAGE(KERN_WARNING, "%s", "No configuration "
557 "data retrieved"); 557 "data retrieved");
558 continue; /* no errror */ 558 continue; /* no error */
559 } 559 }
560 if (conf_len != sizeof (struct dasd_eckd_confdata)) { 560 if (conf_len != sizeof (struct dasd_eckd_confdata)) {
561 MESSAGE(KERN_WARNING, 561 MESSAGE(KERN_WARNING,
@@ -564,7 +564,7 @@ dasd_eckd_read_conf(struct dasd_device *device)
564 conf_len, 564 conf_len,
565 sizeof (struct dasd_eckd_confdata)); 565 sizeof (struct dasd_eckd_confdata));
566 kfree(conf_data); 566 kfree(conf_data);
567 continue; /* no errror */ 567 continue; /* no error */
568 } 568 }
569 /* save first valid configuration data */ 569 /* save first valid configuration data */
570 if (!conf_data_saved){ 570 if (!conf_data_saved){
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 0ae032f3876b..f00161ef99ed 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -792,7 +792,7 @@ int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid)
792 * @scontext: security context 792 * @scontext: security context
793 * @scontext_len: length in bytes 793 * @scontext_len: length in bytes
794 * @sid: security identifier, SID 794 * @sid: security identifier, SID
795 * @def_sid: default SID to assign on errror 795 * @def_sid: default SID to assign on error
796 * 796 *
797 * Obtains a SID associated with the security context that 797 * Obtains a SID associated with the security context that
798 * has the string representation specified by @scontext. 798 * has the string representation specified by @scontext.