Merge "usb: gsi: Fix usage of uninitialized variable" (8a58be49) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/usb/gadget/function/f_gsi.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -292,13 +292,13 @@ static ssize_t usb_gsi_rw_write(struct file *file,
		int ret;

		if (ubuf == NULL) {
		log_event_dbg("%s: buffer is Null.\n", __func__);
		pr_debug("%s: buffer is Null.\n", __func__);
		goto err;
		}

		ret = kstrtou8_from_user(ubuf, count, 0, &input);
		if (ret) {
		log_event_err("%s: Invalid value. err:%d\n", __func__, ret);
		pr_err("%s: Invalid value. err:%d\n", __func__, ret);
		goto err;
		}

		@@ -376,18 +376,18 @@ static ssize_t usb_gsi_rw_timer_write(struct file *file,
		int ret;

		if (ubuf == NULL) {
		log_event_dbg("%s: buffer is NULL.\n", __func__);
		pr_debug("%s: buffer is NULL.\n", __func__);
		goto err;
		}

		ret = kstrtou16_from_user(ubuf, count, 0, &timer_val);
		if (ret) {
		log_event_err("%s: Invalid value. err:%d\n", __func__, ret);
		pr_err("%s: Invalid value. err:%d\n", __func__, ret);
		goto err;
		}

		if (timer_val <= 0 \|\| timer_val > 10000) {
		log_event_err("%s: value must be > 0 and < 10000.\n", __func__);
		pr_err("%s: value must be > 0 and < 10000.\n", __func__);
		goto err;
		}