git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
usb
/
misc
/
auerswald.c
diff --git
a/drivers/usb/misc/auerswald.c
b/drivers/usb/misc/auerswald.c
index
ad2f4cc
..
4fd2110
100644
(file)
--- a/
drivers/usb/misc/auerswald.c
+++ b/
drivers/usb/misc/auerswald.c
@@
-570,10
+570,9
@@
static int auerchain_setup (pauerchain_t acp, unsigned int numElements)
/* fill the list of free elements */
for (;numElements; numElements--) {
/* fill the list of free elements */
for (;numElements; numElements--) {
- acep =
(pauerchainelement_t) kmalloc (sizeof
(auerchainelement_t), GFP_KERNEL);
+ acep =
kzalloc(sizeof
(auerchainelement_t), GFP_KERNEL);
if (!acep)
goto ac_fail;
if (!acep)
goto ac_fail;
- memset (acep, 0, sizeof (auerchainelement_t));
INIT_LIST_HEAD (&acep->list);
list_add_tail (&acep->list, &acp->free_list);
}
INIT_LIST_HEAD (&acep->list);
list_add_tail (&acep->list, &acp->free_list);
}
@@
-761,10
+760,9
@@
static int auerbuf_setup (pauerbufctl_t bcp, unsigned int numElements, unsigned
/* fill the list of free elements */
for (;numElements; numElements--) {
/* fill the list of free elements */
for (;numElements; numElements--) {
- bep =
(pauerbuf_t) kmalloc (sizeof
(auerbuf_t), GFP_KERNEL);
+ bep =
kzalloc(sizeof
(auerbuf_t), GFP_KERNEL);
if (!bep)
goto bl_fail;
if (!bep)
goto bl_fail;
- memset (bep, 0, sizeof (auerbuf_t));
bep->list = bcp;
INIT_LIST_HEAD (&bep->buff_list);
bep->bufp = kmalloc (bufsize, GFP_KERNEL);
bep->list = bcp;
INIT_LIST_HEAD (&bep->buff_list);
bep->bufp = kmalloc (bufsize, GFP_KERNEL);
@@
-808,7
+806,7
@@
static void auerbuf_releasebuf( pauerbuf_t bp)
0 Initial, OK
-EINPROGRESS during submission until end
-ENOENT if urb is unlinked
0 Initial, OK
-EINPROGRESS during submission until end
-ENOENT if urb is unlinked
--ETIME
DOUT Transfer timed out, NAK
+-ETIME
Device did not respond
-ENOMEM Memory Overflow
-ENODEV Specified USB-device or bus doesn't exist
-ENXIO URB already queued
-ENOMEM Memory Overflow
-ENODEV Specified USB-device or bus doesn't exist
-ENXIO URB already queued
@@
-834,7
+832,7
@@
static int auerswald_status_retry (int status)
{
switch (status) {
case 0:
{
switch (status) {
case 0:
- case -ETIME
DOUT
:
+ case -ETIME:
case -EOVERFLOW:
case -EAGAIN:
case -EPIPE:
case -EOVERFLOW:
case -EAGAIN:
case -EPIPE:
@@
-1860,7
+1858,7
@@
static int auerchar_release (struct inode *inode, struct file *file)
/*----------------------------------------------------------------------*/
/* File operation structure */
/*----------------------------------------------------------------------*/
/* File operation structure */
-static struct file_operations auerswald_fops =
+static
const
struct file_operations auerswald_fops =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
{
.owner = THIS_MODULE,
.llseek = no_llseek,