Hi,

this patch uses schedule_timeout instead.

        Regards
                Oliver

--- scanner.h.alt       Thu Nov 29 15:07:05 2001
+++ scanner.h   Sun Dec  2 15:20:18 2001
@@ -223,7 +223,6 @@
        char present;           /* Not zero if device is present */
        char *obuf, *ibuf;      /* transfer buffers */
        char bulk_in_ep, bulk_out_ep, intr_ep; /* Endpoint assignments */
-       wait_queue_head_t rd_wait_q; /* read timeouts */
        struct semaphore sem; /* lock to prevent concurrent reads or writes */
        unsigned int rd_nak_timeout; /* Seconds to wait before read() timeout. */
 };
--- scanner.c.alt       Thu Nov 29 15:06:14 2001
+++ scanner.c   Sun Dec  2 15:25:29 2001
@@ -388,8 +388,6 @@
                goto out_error;
        }

-       init_waitqueue_head(&scn->rd_wait_q);
-
        scn->isopen = 1;

        file->private_data = scn; /* Used by the read and write methods */
@@ -592,7 +590,8 @@
                                        ret = result;
                                        break;
                                } else { /* Keep trying to read data */
-                                       
interruptible_sleep_on_timeout(&scn->rd_wait_q, scn->rd_nak_timeout);
+                                       set_current_state(TASK_INTERRUPTIBLE);
+                                       schedule_timeout(scn->rd_nak_timeout);
                                        continue;
                                }
                        } else { /* Timeout w/ some data */


_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to