Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[PARPORT] SUNBPP: Fix OOPS when debugging is enabled.
[SPARC] openprom: Switch to ref counting PCI API
+8
-5
+6
-4
drivers/parport/parport_sunbpp.c
+6
-4
drivers/parport/parport_sunbpp.c
···
126
126
if (!(value_tcr & P_TCR_BUSY))
127
127
bits |= PARPORT_STATUS_BUSY;
128
128
129
-
dprintk((KERN_DEBUG "tcr 0x%x ir 0x%x\n", regs->p_tcr, regs->p_ir));
129
+
dprintk((KERN_DEBUG "tcr 0x%x ir 0x%x\n", value_tcr, value_ir));
130
130
dprintk((KERN_DEBUG "read status 0x%x\n", bits));
131
131
return bits;
132
132
}
···
147
147
if (value_or & P_OR_SLCT_IN)
148
148
bits |= PARPORT_CONTROL_SELECT;
149
149
150
-
dprintk((KERN_DEBUG "tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
150
+
dprintk((KERN_DEBUG "tcr 0x%x or 0x%x\n", value_tcr, value_or));
151
151
dprintk((KERN_DEBUG "read control 0x%x\n", bits));
152
152
return bits;
153
153
}
···
165
165
unsigned char value_tcr = sbus_readb(®s->p_tcr);
166
166
unsigned char value_or = sbus_readb(®s->p_or);
167
167
168
-
dprintk((KERN_DEBUG "frob1: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
168
+
dprintk((KERN_DEBUG "frob1: tcr 0x%x or 0x%x\n",
169
+
value_tcr, value_or));
169
170
if (mask & PARPORT_CONTROL_STROBE) {
170
171
if (val & PARPORT_CONTROL_STROBE) {
171
172
value_tcr &= ~P_TCR_DS;
···
198
197
199
198
sbus_writeb(value_or, ®s->p_or);
200
199
sbus_writeb(value_tcr, ®s->p_tcr);
201
-
dprintk((KERN_DEBUG "frob2: tcr 0x%x or 0x%x\n", regs->p_tcr, regs->p_or));
200
+
dprintk((KERN_DEBUG "frob2: tcr 0x%x or 0x%x\n",
201
+
value_tcr, value_or));
202
202
return parport_sunbpp_read_control(p);
203
203
}
204
204
+2
-1
drivers/sbus/char/openprom.c
+2
-1
drivers/sbus/char/openprom.c
···
249
249
#ifdef CONFIG_PCI
250
250
struct pci_dev *pdev;
251
251
struct pcidev_cookie *pcp;
252
-
pdev = pci_find_slot (((int *) op->oprom_array)[0],
252
+
pdev = pci_get_bus_and_slot (((int *) op->oprom_array)[0],
253
253
((int *) op->oprom_array)[1]);
254
254
255
255
pcp = pdev->sysdata;
···
260
260
op->oprom_size = sizeof(int);
261
261
err = copyout(argp, op, bufsize + sizeof(int));
262
262
}
263
+
pci_dev_put(pdev);
263
264
#endif
264
265
}
265
266