git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
parport
/
parport_gsc.c
diff --git
a/drivers/parport/parport_gsc.c
b/drivers/parport/parport_gsc.c
index
02d72ac
..
7352104
100644
(file)
--- a/
drivers/parport/parport_gsc.c
+++ b/
drivers/parport/parport_gsc.c
@@
-15,7
+15,7
@@
* Phil Blundell <philb@gnu.org>
* Tim Waugh <tim@cyberelk.demon.co.uk>
* Jose Renau <renau@acm.org>
* Phil Blundell <philb@gnu.org>
* Tim Waugh <tim@cyberelk.demon.co.uk>
* Jose Renau <renau@acm.org>
- * David Campbell
<campbell@torque.net>
+ * David Campbell
* Andrea Arcangeli
*/
* Andrea Arcangeli
*/
@@
-249,7
+249,7
@@
struct parport *__devinit parport_gsc_probe_port (unsigned long base,
struct parport tmp;
struct parport *p = &tmp;
struct parport tmp;
struct parport *p = &tmp;
- priv = k
m
alloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
+ priv = k
z
alloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
if (!priv) {
printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
return NULL;
if (!priv) {
printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
return NULL;
@@
-359,11
+359,12
@@
static int __devinit parport_init_chip(struct parisc_device *dev)
unsigned long port;
if (!dev->irq) {
unsigned long port;
if (!dev->irq) {
- printk("IRQ not found for parallel device at 0x%lx\n", dev->hpa);
+ printk(KERN_WARNING "IRQ not found for parallel device at 0x%lx\n",
+ dev->hpa.start);
return -ENODEV;
}
return -ENODEV;
}
- port = dev->hpa + PARPORT_GSC_OFFSET;
+ port = dev->hpa
.start
+ PARPORT_GSC_OFFSET;
/* some older machines with ASP-chip don't support
* the enhanced parport modes.
/* some older machines with ASP-chip don't support
* the enhanced parport modes.