Messages in this thread Patch in this message | | | Subject | [PATCH] pcmcia: ensure correct logging in do_io_probe [v2] | From | Frans Pop <> | Date | Fri, 7 Nov 2008 15:22:42 +0100 |
| |
I've added parens around the conditions. Maybe not strictly needed, but better readable and consistent with similar usage in cs.c.
Cheers, FJP
--- From: Frans Pop <elendil@planet.nl>
pcmcia: ensure correct logging in do_io_probe During early probing of the parent PCI bridge I/O window no socket has been allocated yet. In that case print &s->cb_dev->dev instead of &s->dev as device. Also properly close previous dev_printk if kzalloc fails.
Signed-off-by: Frans Pop <elendil@planet.nl> CC: Dominik Brodowski <linux@dominikbrodowski.net>
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 17f4ecf..2a6a3d1 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -200,14 +200,17 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base, int any; u_char *b, hole, most; - dev_printk(KERN_INFO, &s->dev, "cs: IO port probe %#x-%#x:", - base, base+num-1); + dev_printk(KERN_INFO, + (s->state & SOCKET_PRESENT) ? &s->dev : &s->cb_dev->dev, + "cs: IO port probe %#x-%#x:", base, base+num-1); /* First, what does a floating port look like? */ b = kzalloc(256, GFP_KERNEL); if (!b) { - dev_printk(KERN_ERR, &s->dev, - "do_io_probe: unable to kmalloc 256 bytes"); + printk("\n"); + dev_printk(KERN_ERR, + (s->state & SOCKET_PRESENT) ? &s->dev : &s->cb_dev->dev, + "cs: do_io_probe: unable to kmalloc 256 bytes"); return; } for (i = base, most = 0; i < base+num; i += 8) {
| |