lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: heci: fix typos and add wait after disconnect

Browse Source 
- Fix typo for enum HECI_WRITE.
 - Fix timeout issue. If the time period is greater or equal 15s, it's timeout.
 - Add 10ms wait time after disconnect, to ensure that hardware is ready.
   Otherwise in the next time connection, hardware resource may be busy.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dongxiao Xu
2009-05-31 14:43:51 +08:00
committed by Greg Kroah-Hartman
parent 58b25a63a1
commit 52b855600c
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/heci/heci_init.c
View File

@@ -1012,6 +1012,7 @@ int heci_disconnect_host_client(struct iamt_heci_device *dev,
if (dev->host_buffer_is_empty) { if (dev->host_buffer_is_empty) {
dev->host_buffer_is_empty = 0; dev->host_buffer_is_empty = 0;
if (heci_disconnect(dev, file_ext)) { if (heci_disconnect(dev, file_ext)) {
mdelay(10); /* Wait for hardware disconnection ready */
list_add_tail(&priv_cb->cb_list, list_add_tail(&priv_cb->cb_list,
&dev->ctrl_rd_list.heci_cb.cb_list); &dev->ctrl_rd_list.heci_cb.cb_list);
} else { } else {

2
drivers/staging/heci/heci_main.c
View File

@@ -1088,7 +1088,7 @@ static ssize_t heci_write(struct file *file, const char __user *ubuf,
if (file_ext == &dev->iamthif_file_ext) { if (file_ext == &dev->iamthif_file_ext) {
priv_write_cb = find_pthi_read_list_entry(dev, file); priv_write_cb = find_pthi_read_list_entry(dev, file);
if ((priv_write_cb != NULL) && if ((priv_write_cb != NULL) &&
(((currtime - priv_write_cb->read_time) > (((currtime - priv_write_cb->read_time) >=
IAMTHIF_READ_TIMER) || IAMTHIF_READ_TIMER) ||
(file_ext->reading_state == HECI_READ_COMPLETE))) { (file_ext->reading_state == HECI_READ_COMPLETE))) {
(*offset) = 0; (*offset) = 0;

2
drivers/staging/heci/interrupt.c
View File

@@ -1054,7 +1054,7 @@ static int heci_bh_write_handler(struct io_heci_list *cmpl_list,
list_del(&priv_cb_pos->cb_list); list_del(&priv_cb_pos->cb_list);
if ((HECI_WRITING == file_ext->writing_state) && if ((HECI_WRITING == file_ext->writing_state) &&
(priv_cb_pos->major_file_operations == (priv_cb_pos->major_file_operations ==
HECI_WRITING) && HECI_WRITE) &&
(file_ext != &dev->iamthif_file_ext)) { (file_ext != &dev->iamthif_file_ext)) {
DBG("HECI WRITE COMPLETE\n"); DBG("HECI WRITE COMPLETE\n");
file_ext->writing_state = file_ext->writing_state =