diff options
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r-- | drivers/net/jazzsonic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 334ff9e12cdd..14248cfc3dfd 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
@@ -131,7 +131,8 @@ static int __init sonic_probe1(struct net_device *dev) | |||
131 | if (sonic_debug && version_printed++ == 0) | 131 | if (sonic_debug && version_printed++ == 0) |
132 | printk(version); | 132 | printk(version); |
133 | 133 | ||
134 | printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", lp->device->bus_id, dev->base_addr); | 134 | printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", |
135 | dev_name(lp->device), dev->base_addr); | ||
135 | 136 | ||
136 | /* | 137 | /* |
137 | * Put the sonic into software reset, then | 138 | * Put the sonic into software reset, then |
@@ -156,7 +157,8 @@ static int __init sonic_probe1(struct net_device *dev) | |||
156 | if ((lp->descriptors = dma_alloc_coherent(lp->device, | 157 | if ((lp->descriptors = dma_alloc_coherent(lp->device, |
157 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), | 158 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), |
158 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { | 159 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { |
159 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", lp->device->bus_id); | 160 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", |
161 | dev_name(lp->device)); | ||
160 | goto out; | 162 | goto out; |
161 | } | 163 | } |
162 | 164 | ||