Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "ppdev: use new parport device model"

This reverts commit e7223f18603374d235d8bb0398532323e5f318b9.

It causes problems when a ppdev tries to register before the parport
driver has been registered with the device model. That will trigger the

BUG_ON(!drv->bus->p);

at drivers/base/driver.c:153. The call chain is

kernel_init ->
kernel_init_freeable ->
do_one_initcall ->
ppdev_init ->
__parport_register_driver ->
driver_register *BOOM*

Reported-by: kernel test robot <fengguang.wu@intel.com>
Reported-by: Ross Zwisler <zwisler@gmail.com>
Reported-by: Petr Mladek <pmladek@suse.com>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

+5 -20
+5 -20
drivers/char/ppdev.c
··· 286 286 struct parport *port; 287 287 struct pardevice *pdev = NULL; 288 288 char *name; 289 - struct pardev_cb ppdev_cb; 289 + int fl; 290 290 291 291 name = kasprintf(GFP_KERNEL, CHRDEV "%x", minor); 292 292 if (name == NULL) ··· 299 299 return -ENXIO; 300 300 } 301 301 302 - memset(&ppdev_cb, 0, sizeof(ppdev_cb)); 303 - ppdev_cb.irq_func = pp_irq; 304 - ppdev_cb.flags = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0; 305 - ppdev_cb.private = pp; 306 - pdev = parport_register_dev_model(port, name, &ppdev_cb, minor); 302 + fl = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0; 303 + pdev = parport_register_device(port, name, NULL, 304 + NULL, pp_irq, fl, pp); 307 305 parport_put_port(port); 308 306 309 307 if (!pdev) { ··· 799 801 device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number)); 800 802 } 801 803 802 - static int pp_probe(struct pardevice *par_dev) 803 - { 804 - struct device_driver *drv = par_dev->dev.driver; 805 - int len = strlen(drv->name); 806 - 807 - if (strncmp(par_dev->name, drv->name, len)) 808 - return -ENODEV; 809 - 810 - return 0; 811 - } 812 - 813 804 static struct parport_driver pp_driver = { 814 805 .name = CHRDEV, 815 - .probe = pp_probe, 816 - .match_port = pp_attach, 806 + .attach = pp_attach, 817 807 .detach = pp_detach, 818 - .devmodel = true, 819 808 }; 820 809 821 810 static int __init ppdev_init(void)