Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212264
b: refs/heads/master
c: 1c4a77b
h: refs/heads/master
v: v3
  • Loading branch information
Dominik Brodowski committed Sep 29, 2010
1 parent b492674 commit 01f1584
Show file tree
Hide file tree
Showing 2 changed files with 11 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: 2262054e74b4b26ed56a8535c1259f6c6c2862a4
refs/heads/master: 1c4a77bf54a61dde135740a563b6ec03382604e8
10 changes: 10 additions & 0 deletions trunk/drivers/pcmcia/pcmcia_resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,11 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev)
s->ops->set_socket(s, &s->socket);
s->lock_count++;

dev_dbg(&p_dev->dev,
"enable_device: V %d, flags %x, base %x, regs %x, idx %x\n",
p_dev->vpp, flags, p_dev->config_base, p_dev->config_regs,
p_dev->config_index);

/* Set up CIS configuration registers */
base = p_dev->config_base;
if (p_dev->config_regs & PRESENT_COPY) {
Expand Down Expand Up @@ -874,6 +879,8 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, struct resource *res,
u_long align;
int w;

dev_dbg(&p_dev->dev, "request_window %pR %d\n", res, speed);

if (!(s->state & SOCKET_PRESENT)) {
dev_dbg(&p_dev->dev, "No card present\n");
return -ENODEV;
Expand Down Expand Up @@ -970,6 +977,9 @@ EXPORT_SYMBOL(pcmcia_request_window);
void pcmcia_disable_device(struct pcmcia_device *p_dev)
{
int i;

dev_dbg(&p_dev->dev, "disabling device\n");

for (i = 0; i < MAX_WIN; i++) {
struct resource *res = p_dev->resource[MAX_IO_WIN + i];
if (res->flags & WIN_FLAGS_REQ)
Expand Down

0 comments on commit 01f1584

Please sign in to comment.