diff options
Diffstat (limited to 'drivers/usb/serial/whiteheat.c')
| -rw-r--r-- | drivers/usb/serial/whiteheat.c | 9 | 
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 36a7740e827..e62f2dff8b7 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c @@ -18,7 +18,6 @@  #include <linux/kernel.h>  #include <linux/errno.h> -#include <linux/init.h>  #include <linux/slab.h>  #include <linux/tty.h>  #include <linux/tty_driver.h> @@ -288,12 +287,8 @@ static int whiteheat_attach(struct usb_serial *serial)  	command_info = kmalloc(sizeof(struct whiteheat_command_private),  								GFP_KERNEL); -	if (command_info == NULL) { -		dev_err(&serial->dev->dev, -			"%s: Out of memory for port structures\n", -			serial->type->description); +	if (!command_info)  		goto no_command_private; -	}  	mutex_init(&command_info->mutex);  	command_info->port_running = 0; @@ -455,8 +450,6 @@ static int whiteheat_ioctl(struct tty_struct *tty,  	struct serial_struct serstruct;  	void __user *user_arg = (void __user *)arg; -	dev_dbg(&port->dev, "%s - cmd 0x%.4x\n", __func__, cmd); -  	switch (cmd) {  	case TIOCGSERIAL:  		memset(&serstruct, 0, sizeof(serstruct));  | 
