Allocated urbs and buffers were never freed on errors in open.
Unified · Split
| @@ -905,20 +905,20 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 904 unmodified lines | ||
| 905 | 905 | status = mos7840_get_reg_sync(port, mos7840_port->SpRegOffset, &Data); |
| 906 | 906 | if (status < 0) { |
| 907 | 907 | dev_dbg(&port->dev, "Reading Spreg failed\n"); |
| 908 | − return -1; | |
| 908 | + goto err; | |
| 909 | 909 | } |
| 910 | 910 | Data |= 0x80; |
| 911 | 911 | status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data); |
| 912 | 912 | if (status < 0) { |
| 913 | 913 | dev_dbg(&port->dev, "writing Spreg failed\n"); |
| 914 | − return -1; | |
| 914 | + goto err; | |
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | Data &= ~0x80; |
| 918 | 918 | status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data); |
| 919 | 919 | if (status < 0) { |
| 920 | 920 | dev_dbg(&port->dev, "writing Spreg failed\n"); |
| 921 | − return -1; | |
| 921 | + goto err; | |
| 922 | 922 | } |
| 923 | 923 | /* End of block to be checked */ |
| 924 | 924 | |
| @@ -927,7 +927,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 2 unmodified lines | ||
| 927 | 927 | &Data); |
| 928 | 928 | if (status < 0) { |
| 929 | 929 | dev_dbg(&port->dev, "Reading Controlreg failed\n"); |
| 930 | − return -1; | |
| 930 | + goto err; | |
| 931 | 931 | } |
| 932 | 932 | Data |= 0x08; /* Driver done bit */ |
| 933 | 933 | Data |= 0x20; /* rx_disable */ |
| @@ -935,7 +935,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 1 unmodified line | ||
| 935 | 935 | mos7840_port->ControlRegOffset, Data); |
| 936 | 936 | if (status < 0) { |
| 937 | 937 | dev_dbg(&port->dev, "writing Controlreg failed\n"); |
| 938 | − return -1; | |
| 938 | + goto err; | |
| 939 | 939 | } |
| 940 | 940 | /* do register settings here */ |
| 941 | 941 | /* Set all regs to the device default values. */ |
| @@ -946,21 +946,21 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 4 unmodified lines | ||
| 946 | 946 | status = mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data); |
| 947 | 947 | if (status < 0) { |
| 948 | 948 | dev_dbg(&port->dev, "disabling interrupts failed\n"); |
| 949 | − return -1; | |
| 949 | + goto err; | |
| 950 | 950 | } |
| 951 | 951 | /* Set FIFO_CONTROL_REGISTER to the default value */ |
| 952 | 952 | Data = 0x00; |
| 953 | 953 | status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data); |
| 954 | 954 | if (status < 0) { |
| 955 | 955 | dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER failed\n"); |
| 956 | − return -1; | |
| 956 | + goto err; | |
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | Data = 0xcf; |
| 960 | 960 | status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data); |
| 961 | 961 | if (status < 0) { |
| 962 | 962 | dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER failed\n"); |
| 963 | − return -1; | |
| 963 | + goto err; | |
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | Data = 0x03; |
| @@ -1103,6 +1103,15 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 136 unmodified lines | ||
| 1103 | 1103 | /* mos7840_change_port_settings(mos7840_port,old_termios); */ |
| 1104 | 1104 | |
| 1105 | 1105 | return 0; |
| 1106 | +err: | |
| 1107 | + for (j = 0; j < NUM_URBS; ++j) { | |
| 1108 | + urb = mos7840_port->write_urb_pool[j]; | |
| 1109 | + if (!urb) | |
| 1110 | + continue; | |
| 1111 | + kfree(urb->transfer_buffer); | |
| 1112 | + usb_free_urb(urb); | |
| 1113 | + } | |
| 1114 | + return status; | |
| 1106 | 1115 | } |
| 1107 | 1116 | |
| 1108 | 1117 | /***************************************************************************** |