staging: ced1401: ced_ioc.c: remove else branch in ced_set_event (c626bd5b) · Commits · 戴 / test

drivers/staging/ced1401/ced_ioc.c

+19 −17

Original line number	Diff line number	Diff line
		@@ -844,6 +844,7 @@ int ced_set_event(struct ced_data ced, struct transfer_event __user ute)
		{
		int ret = U14ERR_NOERROR;
		struct transfer_event te;
		struct transarea *ta;

		/* get a local copy of the data */
		if (copy_from_user(&te, ute, sizeof(te)))
		@@ -851,8 +852,8 @@ int ced_set_event(struct ced_data ced, struct transfer_event __user ute)

		if (te.wAreaNum >= MAX_TRANSAREAS) /* the area must exist */
		return U14ERR_BADAREA;
		else {
		struct transarea *ta = &ced->trans_def[te.wAreaNum];

		ta = &ced->trans_def[te.wAreaNum];

		/* make sure we have no competitor */
		mutex_lock(&ced->io_mutex);
		@@ -869,9 +870,10 @@ int ced_set_event(struct ced_data ced, struct transfer_event __user ute)
		ta->wake_up = 0; /* zero the wake up count */
		} else
		ret = U14ERR_NOTSET;

		spin_unlock_irq(&ced->staged_lock);
		mutex_unlock(&ced->io_mutex);
		}

		return ret ==
		U14ERR_NOERROR ? (te.iSetEvent ? 1 : U14ERR_NOERROR) : ret;
		}