Changeset - 1b56c80b1ee4
[Not reviewed]
default
0 1 0
drewp@bigasterisk.com - 15 years ago 2010-06-19 07:02:35
drewp@bigasterisk.com
patch for newer linux kernels which apparently have err() but not info()
Ignore-this: dc59850cb3f6d08aaa9c478aa4e4d4ef
1 file changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
dmx_usb_module/dmx_usb.c
Show inline comments
 
@@ -680,25 +680,25 @@ static int dmx_usb_probe(struct usb_inte
 
	usb_set_intfdata (interface, dev);
 
	retval = usb_register_dev (interface, &dmx_usb_class);
 
	if (retval) {
 
		/* something prevented us from registering this driver */
 
		err ("Not able to get a minor for this device.");
 
		usb_set_intfdata (interface, NULL);
 
		goto error;
 
	}
 

	
 
	dev->minor = interface->minor;
 

	
 
	/* let the user know what node this device is now attached to */
 
	info ("DMX USB device now attached to dmx%d", dev->minor);
 
	err ("info: DMX USB device now attached to dmx%d", dev->minor);
 
	return 0;
 

	
 
error:
 
	dmx_usb_delete (dev);
 
	return retval;
 
}
 

	
 

	
 
/**
 
 *
 
 *	Called by the usb core when the device is removed from the system.
 
 *
 
@@ -734,45 +734,45 @@ static void dmx_usb_disconnect(struct us
 

	
 
	/* prevent device read, write and ioctl */
 
	dev->present = 0;
 

	
 
	up (&dev->sem);
 

	
 
	/* if the device is opened, dmx_usb_release will clean this up */
 
	if (!dev->open)
 
		dmx_usb_delete (dev);
 

	
 
	up (&disconnect_sem);
 

	
 
	info("DMX USB #%d now disconnected", minor);
 
	err("info: DMX USB #%d now disconnected", minor);
 
}
 

	
 

	
 

	
 
/**
 
 *	dmx_usb_init
 
 */
 
static int __init dmx_usb_init(void)
 
{
 
	int result;
 

	
 
	/* register this driver with the USB subsystem */
 
	result = usb_register(&dmx_usb_driver);
 
	if (result) {
 
		err("usb_register failed. Error number %d",
 
		    result);
 
		return result;
 
	}
 

	
 
	info(DRIVER_DESC " " DRIVER_VERSION);
 
	err("info: " DRIVER_DESC " " DRIVER_VERSION);
 
	return 0;
 
}
 

	
 

	
 
/**
 
 *	dmx_usb_exit
 
 */
 
static void __exit dmx_usb_exit(void)
 
{
 
	/* deregister this driver with the USB subsystem */
 
	usb_deregister(&dmx_usb_driver);
 
}
0 comments (0 inline, 0 general)