diff --git a/drivers/staging/hievent/hievent_driver.c b/drivers/staging/hievent/hievent_driver.c
index f6b378766abc6a18128d9c420ee717cef803028b..8331a9632e62ab366004448ca9d6387d23f7e39d 100644
--- a/drivers/staging/hievent/hievent_driver.c
+++ b/drivers/staging/hievent/hievent_driver.c
@@ -178,6 +178,13 @@ static ssize_t hievent_read(struct file *file, char __user *user_buf,
 
 	retval = header.len + sizeof(header);
 out:
+	if (retval == -ENOMEM) {
+		// clean ring buffer
+		hievent_dev.write_offset = 0;
+		hievent_dev.head_offset = 0;
+		hievent_dev.size = 0;
+		hievent_dev.count = 0;
+	}
 	(void)mutex_unlock(&hievent_dev.mtx);
 
 	return retval;
@@ -297,7 +304,7 @@ static unsigned int hievent_poll(struct file *filep,
 	return (POLLOUT | POLLWRNORM);
 }
 
-static ssize_t  hievent_write_iter(struct kiocb *iocb, struct iov_iter *from)
+static ssize_t hievent_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
 	int check_code = 0;
 	unsigned char *temp_buffer = NULL;
@@ -306,7 +313,7 @@ static ssize_t  hievent_write_iter(struct kiocb *iocb, struct iov_iter *from)
 	int buf_len;
 
 	(void)iocb;
-	if (from->nr_segs != 3) {     /* must contain 3 segments */
+	if (from->nr_segs != 3) { /* must contain 3 segments */
 		retval = -EINVAL;
 		goto out;
 	}
@@ -361,8 +368,8 @@ static ssize_t  hievent_write_iter(struct kiocb *iocb, struct iov_iter *from)
 }
 
 static const struct file_operations hievent_fops = {
-	.read  = hievent_read,   /* read */
-	.poll  = hievent_poll,   /* poll */
+	.read = hievent_read,   /* read */
+	.poll = hievent_poll,   /* poll */
 	.write_iter = hievent_write_iter, /* write_iter */
 };
 
diff --git a/drivers/staging/hilog/Kconfig b/drivers/staging/hilog/Kconfig
index 23fe9000b58510ba9e656781ebd49862bafd781b..243934c4cc4c079e7438424f401ae603dbe002cd 100644
--- a/drivers/staging/hilog/Kconfig
+++ b/drivers/staging/hilog/Kconfig
@@ -14,8 +14,9 @@ config HILOG
 
 	  If unsure, say N.
 
-if HILOG
-config HI_LOG_BUFFER_SIZE
-	int "hi log buffer size"
-	default "2048"
-endif
+config HILOG_BUFFER_SIZE
+	int "hilog buffer size"
+	depends on HILOG
+	default 4096
+	help
+		Define the default ring buffer size of hilog
diff --git a/drivers/staging/hilog/hilog.c b/drivers/staging/hilog/hilog.c
index dae5ab074cc86a883d0d3ffdd3ba0d368947e3f0..167d4e3f359f742676b5dd713d8fbea90641f5dc 100644
--- a/drivers/staging/hilog/hilog.c
+++ b/drivers/staging/hilog/hilog.c
@@ -44,7 +44,7 @@ module_param(hilog_major, int, 0444);
 
 struct cdev g_hilog_cdev;
 
-#define HILOG_BUFFER ((size_t)1024)
+#define HILOG_BUFFER CONFIG_HILOG_BUFFER_SIZE
 #define HILOG_DRIVER "/dev/hilog"
 
 struct hilog_entry {
@@ -187,6 +187,13 @@ static ssize_t hilog_read(struct file *file,
 	hilog_buffer_dec(header.len);
 	retval = header.len + sizeof(header);
 out:
+	if (retval == -ENOMEM) {
+		// clean ring buffer
+		hilog_dev.wr_off = 0;
+		hilog_dev.hdr_off = 0;
+		hilog_dev.size = 0;
+		hilog_dev.count = 0;
+	}
 	(void)mutex_unlock(&hilog_dev.mtx);
 
 	return retval;
@@ -262,6 +269,7 @@ static void hilog_cover_old_log(size_t buf_len)
 	int retval;
 	struct hilog_entry header;
 	size_t total_size = buf_len + sizeof(struct hilog_entry);
+	int drop_log_lines = 0;
 
 	while (total_size + hilog_dev.size >= HILOG_BUFFER) {
 		retval = hilog_read_ring_head_buffer((unsigned char *)&header,
@@ -269,8 +277,12 @@ static void hilog_cover_old_log(size_t buf_len)
 		if (retval < 0)
 			break;
 
+		drop_log_lines++;
 		hilog_buffer_dec(sizeof(header) + header.len);
 	}
+	if (drop_log_lines > 0)
+		pr_info("hilog ringbuffer full, drop %d line(s) log",
+			drop_log_lines);
 }
 
 int hilog_write_internal(const char __user *buffer, size_t buf_len)