diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:26:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:26:40 -0700 |
| commit | a0d4e51c1a5e5d031aa9dd1fb2fa207ccfafe627 (patch) | |
| tree | 84e11f0a0f05db79a9f70d688904b224bb4ecedb /include/linux/device.h | |
| parent | be9bc8d1f307a4c57b51284eb1393fcd950f9c4c (diff) | |
| parent | 3004c70f9036bbb74ea2842995edc8a21de9106e (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 9bc07b556eea..bd05cdfb326e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -400,7 +400,7 @@ extern void firmware_unregister(struct subsystem *); /* debugging and troubleshooting/diagnostic helpers. */ #define dev_printk(level, dev, format, arg...) \ - printk(level "%s %s: " format , (dev)->driver->name , (dev)->bus_id , ## arg) + printk(level "%s %s: " format , (dev)->driver ? (dev)->driver->name : "" , (dev)->bus_id , ## arg) #ifdef DEBUG #define dev_dbg(dev, format, arg...) \ |