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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
usb
/
image
/
mdc800.c
diff --git
a/drivers/usb/image/mdc800.c
b/drivers/usb/image/mdc800.c
index
b05c168
..
f401557
100644
(file)
--- a/
drivers/usb/image/mdc800.c
+++ b/
drivers/usb/image/mdc800.c
@@
-190,7
+190,7
@@
static struct usb_endpoint_descriptor mdc800_ed [4] =
/* The Variable used by the driver */
/* The Variable used by the driver */
-static struct mdc800_data* mdc800
=0
;
+static struct mdc800_data* mdc800;
/***************************************************************************
/***************************************************************************
@@
-547,7
+547,7
@@
static void mdc800_usb_disconnect (struct usb_interface *intf)
usb_unlink_urb (mdc800->write_urb);
usb_unlink_urb (mdc800->download_urb);
usb_unlink_urb (mdc800->write_urb);
usb_unlink_urb (mdc800->download_urb);
- mdc800->dev
=0
;
+ mdc800->dev
= NULL
;
usb_set_intfdata(intf, NULL);
}
info ("Mustek MDC800 disconnected from USB.");
usb_set_intfdata(intf, NULL);
}
info ("Mustek MDC800 disconnected from USB.");
@@
-667,10
+667,10
@@
static int mdc800_device_release (struct inode* inode, struct file *file)
/*
* The Device read callback Function
*/
/*
* The Device read callback Function
*/
-static ssize_t mdc800_device_read (struct file *file, char *buf, size_t len, loff_t *pos)
+static ssize_t mdc800_device_read (struct file *file, char
__user
*buf, size_t len, loff_t *pos)
{
size_t left=len, sts=len; /* single transfer size */
{
size_t left=len, sts=len; /* single transfer size */
- char
* ptr=
buf;
+ char
__user *ptr =
buf;
long timeout;
DECLARE_WAITQUEUE(wait, current);
long timeout;
DECLARE_WAITQUEUE(wait, current);
@@
-767,7
+767,7
@@
static ssize_t mdc800_device_read (struct file *file, char *buf, size_t len, lof
* After this the driver initiates the request for the answer or
* just waits until the camera becomes ready.
*/
* After this the driver initiates the request for the answer or
* just waits until the camera becomes ready.
*/
-static ssize_t mdc800_device_write (struct file *file, const char *buf, size_t len, loff_t *pos)
+static ssize_t mdc800_device_write (struct file *file, const char
__user
*buf, size_t len, loff_t *pos)
{
size_t i=0;
DECLARE_WAITQUEUE(wait, current);
{
size_t i=0;
DECLARE_WAITQUEUE(wait, current);
@@
-971,9
+971,7
@@
static struct usb_driver mdc800_usb_driver =
Init and Cleanup this driver (Main Functions)
*************************************************************************/
Init and Cleanup this driver (Main Functions)
*************************************************************************/
-#define try(A) if ((A) == 0) goto cleanup_on_fail;
-#define try_free_mem(A) if (A != 0) { kfree (A); A=0; }
-#define try_free_urb(A) if (A != 0) { usb_free_urb (A); A=0; }
+#define try(A) if (!(A)) goto cleanup_on_fail;
static int __init usb_mdc800_init (void)
{
static int __init usb_mdc800_init (void)
{
@@
-982,7
+980,7
@@
static int __init usb_mdc800_init (void)
try (mdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL));
memset(mdc800, 0, sizeof(struct mdc800_data));
try (mdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL));
memset(mdc800, 0, sizeof(struct mdc800_data));
- mdc800->dev
=0
;
+ mdc800->dev
= NULL
;
mdc800->open=0;
mdc800->state=NOT_CONNECTED;
init_MUTEX (&mdc800->io_lock);
mdc800->open=0;
mdc800->state=NOT_CONNECTED;
init_MUTEX (&mdc800->io_lock);
@@
-1020,17
+1018,17
@@
cleanup_on_fail:
{
err ("can't alloc memory!");
{
err ("can't alloc memory!");
-
try_free_mem
(mdc800->download_urb_buffer);
-
try_free_mem
(mdc800->write_urb_buffer);
-
try_free_mem
(mdc800->irq_urb_buffer);
+
kfree
(mdc800->download_urb_buffer);
+
kfree
(mdc800->write_urb_buffer);
+
kfree
(mdc800->irq_urb_buffer);
-
try_free_urb
(mdc800->write_urb);
-
try_free_urb
(mdc800->download_urb);
-
try_free_urb
(mdc800->irq_urb);
+
usb_free_urb
(mdc800->write_urb);
+
usb_free_urb
(mdc800->download_urb);
+
usb_free_urb
(mdc800->irq_urb);
kfree (mdc800);
}
kfree (mdc800);
}
- mdc800
=0
;
+ mdc800
= NULL
;
return retval;
}
return retval;
}
@@
-1048,7
+1046,7
@@
static void __exit usb_mdc800_cleanup (void)
kfree (mdc800->download_urb_buffer);
kfree (mdc800);
kfree (mdc800->download_urb_buffer);
kfree (mdc800);
- mdc800
=0
;
+ mdc800
= NULL
;
}
module_init (usb_mdc800_init);
}
module_init (usb_mdc800_init);