Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14147
b: refs/heads/master
c: 807277c
h: refs/heads/master
i:
  14145: 2a7b60f
  14143: 734aec8
v: v3
  • Loading branch information
Dominik Brodowski committed Nov 12, 2005
1 parent bfb1e7b commit aa8733f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfb279c97510da659816f4f055146bb1f9f0a870
refs/heads/master: 807277cbf9a240b133ee378a53b65375088ef62a
6 changes: 6 additions & 0 deletions trunk/drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,11 @@ static int socket_insert(struct pcmcia_socket *skt)
ret = socket_setup(skt, setup_delay);
if (ret == CS_SUCCESS) {
skt->state |= SOCKET_PRESENT;

printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
(skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
skt->sock);

#ifdef CONFIG_CARDBUS
if (skt->state & SOCKET_CARDBUS) {
cb_alloc(skt);
Expand Down Expand Up @@ -598,6 +603,7 @@ static int socket_resume(struct pcmcia_socket *skt)

static void socket_remove(struct pcmcia_socket *skt)
{
printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
socket_shutdown(skt);
cs_socket_put(skt);
}
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,9 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
list_add_tail(&p_dev->socket_device_list, &s->devices_list);
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);

printk(KERN_NOTICE "pcmcia: registering new device %s\n",
p_dev->devname);

pcmcia_device_query(p_dev);

if (device_register(&p_dev->dev)) {
Expand Down

0 comments on commit aa8733f

Please sign in to comment.