diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index afad4ab8f..40f971d35 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -96,12 +96,11 @@ static int do_em_all(void)
 			 || hasmntopt(m, MNTOPT_NOAUTO) == NULL
 			) {
 #if ENABLE_FEATURE_SWAPON_PRI
-				char *p;
 				g_flags = 0; /* each swap space might have different flags */
-				p = strstr(m->mnt_opts, "pri=");
+				char *p = hasmntopt(m,"pri");
 				if (p) {
 					/* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */
-					int swap_prio = MIN(bb_strtoull(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
+					unsigned int swap_prio = MIN(bb_strtou(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
 					/* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */
 					if (errno != ERANGE) {
 						g_flags = SWAP_FLAG_PREFER |