git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 2.6.10-1.12-FC2
[linux-2.6.git]
/
drivers
/
usb
/
image
/
mdc800.c
diff --git
a/drivers/usb/image/mdc800.c
b/drivers/usb/image/mdc800.c
index
f401557
..
66bb133
100644
(file)
--- a/
drivers/usb/image/mdc800.c
+++ b/
drivers/usb/image/mdc800.c
@@
-317,7
+317,6
@@
static int mdc800_usb_waitForIRQ (int mode, int msec)
mdc800->camera_request_ready=1+mode;
add_wait_queue(&mdc800->irq_wait, &wait);
mdc800->camera_request_ready=1+mode;
add_wait_queue(&mdc800->irq_wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
timeout = msec*HZ/1000;
while (!mdc800->irq_woken && timeout)
{
timeout = msec*HZ/1000;
while (!mdc800->irq_woken && timeout)
{
@@
-325,7
+324,6
@@
static int mdc800_usb_waitForIRQ (int mode, int msec)
timeout = schedule_timeout (timeout);
}
remove_wait_queue(&mdc800->irq_wait, &wait);
timeout = schedule_timeout (timeout);
}
remove_wait_queue(&mdc800->irq_wait, &wait);
- set_current_state(TASK_RUNNING);
mdc800->irq_woken = 0;
if (mdc800->camera_request_ready>0)
mdc800->irq_woken = 0;
if (mdc800->camera_request_ready>0)
@@
-543,9
+541,9
@@
static void mdc800_usb_disconnect (struct usb_interface *intf)
mdc800->state=NOT_CONNECTED;
mdc800->state=NOT_CONNECTED;
- usb_
unlink_urb
(mdc800->irq_urb);
- usb_
unlink_urb
(mdc800->write_urb);
- usb_
unlink_urb
(mdc800->download_urb);
+ usb_
kill_urb
(mdc800->irq_urb);
+ usb_
kill_urb
(mdc800->write_urb);
+ usb_
kill_urb
(mdc800->download_urb);
mdc800->dev = NULL;
usb_set_intfdata(intf, NULL);
mdc800->dev = NULL;
usb_set_intfdata(intf, NULL);
@@
-649,9
+647,9
@@
static int mdc800_device_release (struct inode* inode, struct file *file)
down (&mdc800->io_lock);
if (mdc800->open && (mdc800->state != NOT_CONNECTED))
{
down (&mdc800->io_lock);
if (mdc800->open && (mdc800->state != NOT_CONNECTED))
{
- usb_
unlink_urb
(mdc800->irq_urb);
- usb_
unlink_urb
(mdc800->write_urb);
- usb_
unlink_urb
(mdc800->download_urb);
+ usb_
kill_urb
(mdc800->irq_urb);
+ usb_
kill_urb
(mdc800->write_urb);
+ usb_
kill_urb
(mdc800->download_urb);
mdc800->open=0;
}
else
mdc800->open=0;
}
else
@@
-725,7
+723,6
@@
static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
set_current_state(TASK_UNINTERRUPTIBLE);
timeout = schedule_timeout (timeout);
}
set_current_state(TASK_UNINTERRUPTIBLE);
timeout = schedule_timeout (timeout);
}
- set_current_state(TASK_RUNNING);
remove_wait_queue(&mdc800->download_wait, &wait);
mdc800->downloaded = 0;
if (mdc800->download_urb->status != 0)
remove_wait_queue(&mdc800->download_wait, &wait);
mdc800->downloaded = 0;
if (mdc800->download_urb->status != 0)
@@
-851,12
+848,11
@@
static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
set_current_state(TASK_UNINTERRUPTIBLE);
timeout = schedule_timeout (timeout);
}
set_current_state(TASK_UNINTERRUPTIBLE);
timeout = schedule_timeout (timeout);
}
- set_current_state(TASK_RUNNING);
remove_wait_queue(&mdc800->write_wait, &wait);
mdc800->written = 0;
if (mdc800->state == WORKING)
{
remove_wait_queue(&mdc800->write_wait, &wait);
mdc800->written = 0;
if (mdc800->state == WORKING)
{
- usb_
unlink_urb
(mdc800->write_urb);
+ usb_
kill_urb
(mdc800->write_urb);
up (&mdc800->io_lock);
return -EIO;
}
up (&mdc800->io_lock);
return -EIO;
}