+7

sound/core/seq/seq_clientmgr.c

reviewed

··· 1290 1290 client->midi_version = client_info->midi_version; 1291 1291 memcpy(client->event_filter, client_info->event_filter, 32); 1292 1292 client->group_filter = client_info->group_filter; 1293 1293 + 1294 1294 + /* notify the change */ 1295 1295 + snd_seq_system_client_ev_client_change(client->number); 1296 1296 + 1293 1297 return 0; 1294 1298 } 1295 1299 ··· 1417 1413 if (port) { 1418 1414 snd_seq_set_port_info(port, info); 1419 1415 snd_seq_port_unlock(port); 1416 1416 + /* notify the change */ 1417 1417 + snd_seq_system_client_ev_port_change(info->addr.client, 1418 1418 + info->addr.port); 1420 1419 } 1421 1420 return 0; 1422 1421 }

+23 -2

sound/core/seq/seq_system.c

reviewed

··· 49 49 /* port id numbers for this client */ 50 50 static int announce_port = -1; 51 51 52 52 + /* number of subscriptions to announce port */ 53 53 + static int announce_subscribed; 52 54 53 55 54 56 /* fill standard header data, source port & channel are filled in */ 55 57 static int setheader(struct snd_seq_event * ev, int client, int port) 56 58 { 57 57 - if (announce_port < 0) 59 59 + if (announce_port < 0 || !announce_subscribed) 58 60 return -ENODEV; 59 61 60 62 memset(ev, 0, sizeof(struct snd_seq_event)); ··· 106 104 return snd_seq_control_queue(ev, atomic, hop); 107 105 } 108 106 107 107 + static int sys_announce_subscribe(void *private_data, 108 108 + struct snd_seq_port_subscribe *info) 109 109 + { 110 110 + announce_subscribed++; 111 111 + return 0; 112 112 + } 113 113 + 114 114 + static int sys_announce_unsubscribe(void *private_data, 115 115 + struct snd_seq_port_subscribe *info) 116 116 + { 117 117 + if (snd_BUG_ON(!announce_subscribed)) 118 118 + return 0; 119 119 + announce_subscribed--; 120 120 + return 0; 121 121 + } 122 122 + 109 123 /* register our internal client */ 110 124 int __init snd_seq_system_client_init(void) 111 125 { ··· 161 143 /* register announcement port */ 162 144 strcpy(port->name, "Announce"); 163 145 port->capability = SNDRV_SEQ_PORT_CAP_READ|SNDRV_SEQ_PORT_CAP_SUBS_READ; /* for broadcast only */ 164 164 - port->kernel = NULL; 146 146 + pcallbacks.event_input = NULL; 147 147 + pcallbacks.subscribe = sys_announce_subscribe; 148 148 + pcallbacks.unsubscribe = sys_announce_unsubscribe; 149 149 + port->kernel = &pcallbacks; 165 150 port->type = 0; 166 151 port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT; 167 152 port->addr.client = sysclient;

-2

sound/core/seq/seq_ump_client.c

reviewed

··· 272 272 new); 273 273 if (err < 0) 274 274 continue; 275 275 - /* notify to system port */ 276 276 - snd_seq_system_client_ev_port_change(client->seq_client, i); 277 275 } 278 276 } 279 277

+1 -1

sound/pci/ac97/ac97_codec.c

reviewed

··· 1864 1864 strcat(name, " "); 1865 1865 strcat(name, pid->name); 1866 1866 if (pid->mask != 0xffffffff) 1867 1867 - sprintf(name + strlen(name), " rev %d", id & ~pid->mask); 1867 1867 + sprintf(name + strlen(name), " rev %u", id & ~pid->mask); 1868 1868 if (ac97 && pid->patch) { 1869 1869 if ((modem && (pid->flags & AC97_MODEM_PATCH)) || 1870 1870 (! modem && ! (pid->flags & AC97_MODEM_PATCH)))

-2

sound/pci/hda/hda_hwdep.c

reviewed

··· 84 84 85 85 static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file) 86 86 { 87 87 - #ifndef CONFIG_SND_DEBUG_VERBOSE 88 87 if (!capable(CAP_SYS_RAWIO)) 89 88 return -EACCES; 90 90 - #endif 91 89 return 0; 92 90 } 93 91

+1 -1

sound/pci/hda/hda_sysfs.c

reviewed

··· 648 648 }, 649 649 }; 650 650 651 651 - /* check the line starting with '[' -- change the parser mode accodingly */ 651 651 + /* check the line starting with '[' -- change the parser mode accordingly */ 652 652 static int parse_line_mode(char *buf, struct hda_bus *bus) 653 653 { 654 654 int i;

+1 -1

sound/pci/lola/lola_clock.c

reviewed

··· 35 35 default: return 0; /* error */ 36 36 } 37 37 38 38 - /* ajustement */ 38 38 + /* adjustement */ 39 39 switch (coded & 0x60) { 40 40 case (0 << 5): break; 41 41 case (1 << 5): freq = (freq * 999) / 1000; break;