aboutsummaryrefslogtreecommitdiff
path: root/sound/usb/6fire/comm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/6fire/comm.c')
-rw-r--r--sound/usb/6fire/comm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
index af6ec8da07e..161215d78d9 100644
--- a/sound/usb/6fire/comm.c
+++ b/sound/usb/6fire/comm.c
@@ -5,7 +5,6 @@
*
* Author: Torsten Schenk <torsten.schenk@zoho.com>
* Created: Jan 01, 2011
- * Version: 0.3.0
* Copyright: (C) Torsten Schenk
*
* This program is free software; you can redistribute it and/or modify
@@ -52,7 +51,7 @@ static void usb6fire_comm_receiver_handler(struct urb *urb)
urb->status = 0;
urb->actual_length = 0;
if (usb_submit_urb(urb, GFP_ATOMIC) < 0)
- snd_printk(KERN_WARNING PREFIX
+ dev_warn(&urb->dev->dev,
"comm data receiver aborted.\n");
}
}
@@ -144,11 +143,11 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
return ret;
}
-int __devinit usb6fire_comm_init(struct sfire_chip *chip)
+int usb6fire_comm_init(struct sfire_chip *chip)
{
struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime),
GFP_KERNEL);
- struct urb *urb = &rt->receiver;
+ struct urb *urb;
int ret;
if (!rt)
@@ -160,6 +159,7 @@ int __devinit usb6fire_comm_init(struct sfire_chip *chip)
return -ENOMEM;
}
+ urb = &rt->receiver;
rt->serial = 1;
rt->chip = chip;
usb_init_urb(urb);
@@ -179,7 +179,7 @@ int __devinit usb6fire_comm_init(struct sfire_chip *chip)
if (ret < 0) {
kfree(rt->receiver_buffer);
kfree(rt);
- snd_printk(KERN_ERR PREFIX "cannot create comm data receiver.");
+ dev_err(&chip->dev->dev, "cannot create comm data receiver.");
return ret;
}
chip->comm = rt;