Commit 0011a33f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge for applying the timer API conversion patch for line6
driver that conflicts with the recent fix in upstream.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 49815404 99fee508

sound/core/seq/seq_clientmgr.c

+5 −1
Original line number Diff line number Diff line
@@ -1263,6 +1263,7 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg) 
	struct snd_seq_port_info *info = arg;

	struct snd_seq_client_port *port;

	struct snd_seq_port_callback *callback;

	int port_idx;



	/* it is not allowed to create the port for an another client */

	if (info->addr.client != client->number)
@@ -1273,7 +1274,9 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg) 
		return -ENOMEM;



	if (client->type == USER_CLIENT && info->kernel) {

		snd_seq_delete_port(client, port->addr.port);

		port_idx = port->addr.port;

		snd_seq_port_unlock(port);

		snd_seq_delete_port(client, port_idx);

		return -EINVAL;

	}

	if (client->type == KERNEL_CLIENT) {
@@ -1294,6 +1297,7 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg) 


	snd_seq_set_port_info(port, info);

	snd_seq_system_client_ev_port_start(port->addr.client, port->addr.port);

	snd_seq_port_unlock(port);



	return 0;

}

sound/core/seq/seq_ports.c

+5 −2
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ static void port_subs_info_init(struct snd_seq_port_subs_info *grp) 
}





/* create a port, port number is returned (-1 on failure) */

/* create a port, port number is returned (-1 on failure);

 * the caller needs to unref the port via snd_seq_port_unlock() appropriately

 */

struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client,

						int port)

{
@@ -151,6 +153,7 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client, 
	snd_use_lock_init(&new_port->use_lock);

	port_subs_info_init(&new_port->c_src);

	port_subs_info_init(&new_port->c_dest);

	snd_use_lock_use(&new_port->use_lock);



	num = port >= 0 ? port : 0;

	mutex_lock(&client->ports_mutex);
@@ -165,9 +168,9 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client, 
	list_add_tail(&new_port->list, &p->list);

	client->num_ports++;

	new_port->addr.port = num;	/* store the port number in the port */

	sprintf(new_port->name, "port-%d", num);

	write_unlock_irqrestore(&client->ports_lock, flags);

	mutex_unlock(&client->ports_mutex);

	sprintf(new_port->name, "port-%d", num);



	return new_port;

}

sound/usb/caiaq/device.c

+9 −3
Original line number Diff line number Diff line
@@ -476,10 +476,12 @@ static int init_card(struct snd_usb_caiaqdev *cdev) 


	err = snd_usb_caiaq_send_command(cdev, EP1_CMD_GET_DEVICE_INFO, NULL, 0);

	if (err)

		return err;

		goto err_kill_urb;



	if (!wait_event_timeout(cdev->ep1_wait_queue, cdev->spec_received, HZ))

		return -ENODEV;

	if (!wait_event_timeout(cdev->ep1_wait_queue, cdev->spec_received, HZ)) {

		err = -ENODEV;

		goto err_kill_urb;

	}



	usb_string(usb_dev, usb_dev->descriptor.iManufacturer,

		   cdev->vendor_name, CAIAQ_USB_STR_LEN);
@@ -514,6 +516,10 @@ static int init_card(struct snd_usb_caiaqdev *cdev) 


	setup_card(cdev);

	return 0;



 err_kill_urb:

	usb_kill_urb(&cdev->ep1_in_urb);

	return err;

}



static int snd_probe(struct usb_interface *intf,

sound/usb/line6/driver.c

+4 −3
Original line number Diff line number Diff line
@@ -793,9 +793,10 @@ int line6_probe(struct usb_interface *interface, 
	return 0;



 error:

	if (line6->disconnect)

		line6->disconnect(line6);

	snd_card_free(card);

	/* we can call disconnect callback here because no close-sync is

	 * needed yet at this point

	 */

	line6_disconnect(interface);

	return ret;

}

EXPORT_SYMBOL_GPL(line6_probe);

sound/usb/line6/podhd.c

+5 −3
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ static void podhd_disconnect(struct usb_line6 *line6) 


		intf = usb_ifnum_to_if(line6->usbdev,

					pod->line6.properties->ctrl_if);

		if (intf)

			usb_driver_release_interface(&podhd_driver, intf);

	}

}
@@ -318,6 +319,9 @@ static int podhd_init(struct usb_line6 *line6, 


	line6->disconnect = podhd_disconnect;



	init_timer(&pod->startup_timer);

	INIT_WORK(&pod->startup_work, podhd_startup_workqueue);



	if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) {

		/* claim the data interface */

		intf = usb_ifnum_to_if(line6->usbdev,
@@ -359,8 +363,6 @@ static int podhd_init(struct usb_line6 *line6, 
	}



	/* init device and delay registering */

	init_timer(&pod->startup_timer);

	INIT_WORK(&pod->startup_work, podhd_startup_workqueue);

	podhd_startup(pod);

	return 0;

}