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
[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()
[pandora-kernel.git]
/
drivers
/
usb
/
misc
/
uss720.c
diff --git
a/drivers/usb/misc/uss720.c
b/drivers/usb/misc/uss720.c
index
0592cb5
..
7025025
100644
(file)
--- a/
drivers/usb/misc/uss720.c
+++ b/
drivers/usb/misc/uss720.c
@@
-41,8
+41,6
@@
/*****************************************************************************/
/*****************************************************************************/
-#define DEBUG
-
#include <linux/module.h>
#include <linux/socket.h>
#include <linux/parport.h>
#include <linux/module.h>
#include <linux/socket.h>
#include <linux/parport.h>
@@
-108,7
+106,7
@@
static void destroy_async(struct kref *kref)
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
-static void async_complete(struct urb *urb
, struct pt_regs *ptregs
)
+static void async_complete(struct urb *urb)
{
struct uss720_async_request *rq;
struct parport *pp;
{
struct uss720_async_request *rq;
struct parport *pp;
@@
-129,7
+127,7
@@
static void async_complete(struct urb *urb, struct pt_regs *ptregs)
#endif
/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
if (rq->reg[2] & rq->reg[1] & 0x10 && pp)
#endif
/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
if (rq->reg[2] & rq->reg[1] & 0x10 && pp)
- parport_generic_irq(0, pp
, NULL
);
+ parport_generic_irq(0, pp);
}
complete(&rq->compl);
kref_put(&rq->ref_count, destroy_async);
}
complete(&rq->compl);
kref_put(&rq->ref_count, destroy_async);
@@
-707,7
+705,7
@@
static int uss720_probe(struct usb_interface *intf,
/*
* Allocate parport interface
*/
/*
* Allocate parport interface
*/
- if (!(priv = k
calloc(sizeof(struct parport_uss720_private), 1
, GFP_KERNEL))) {
+ if (!(priv = k
zalloc(sizeof(struct parport_uss720_private)
, GFP_KERNEL))) {
usb_put_dev(usbdev);
return -ENOMEM;
}
usb_put_dev(usbdev);
return -ENOMEM;
}
@@
-782,7
+780,6
@@
MODULE_DEVICE_TABLE (usb, uss720_table);
static struct usb_driver uss720_driver = {
static struct usb_driver uss720_driver = {
- .owner = THIS_MODULE,
.name = "uss720",
.probe = uss720_probe,
.disconnect = uss720_disconnect,
.name = "uss720",
.probe = uss720_probe,
.disconnect = uss720_disconnect,