aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/line6/podhd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/line6/podhd.c')
-rw-r--r--sound/usb/line6/podhd.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 7217fa7e5db1..43c39886597e 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -87,15 +87,11 @@ static struct line6_pcm_properties podhd_pcm_properties = {
87/* 87/*
88 Try to init POD HD device. 88 Try to init POD HD device.
89*/ 89*/
90static int podhd_init(struct usb_interface *interface, 90static int podhd_init(struct usb_line6 *line6,
91 struct usb_line6 *line6) 91 const struct usb_device_id *id)
92{ 92{
93 struct usb_line6_podhd *podhd = (struct usb_line6_podhd *) line6;
94 int err; 93 int err;
95 94
96 if ((interface == NULL) || (podhd == NULL))
97 return -ENODEV;
98
99 /* initialize MIDI subsystem: */ 95 /* initialize MIDI subsystem: */
100 err = line6_init_midi(line6); 96 err = line6_init_midi(line6);
101 if (err < 0) 97 if (err < 0)
@@ -181,14 +177,9 @@ static const struct line6_properties podhd_properties_table[] = {
181static int podhd_probe(struct usb_interface *interface, 177static int podhd_probe(struct usb_interface *interface,
182 const struct usb_device_id *id) 178 const struct usb_device_id *id)
183{ 179{
184 struct usb_line6_podhd *podhd; 180 return line6_probe(interface, id,
185
186 podhd = kzalloc(sizeof(*podhd), GFP_KERNEL);
187 if (!podhd)
188 return -ENODEV;
189 return line6_probe(interface, &podhd->line6,
190 &podhd_properties_table[id->driver_info], 181 &podhd_properties_table[id->driver_info],
191 podhd_init); 182 podhd_init, sizeof(struct usb_line6_podhd));
192} 183}
193 184
194static struct usb_driver podhd_driver = { 185static struct usb_driver podhd_driver = {