diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tc35815.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/keyspan.c | 2 | ||||
| -rw-r--r-- | drivers/video/s3c2410fb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d887c05..370d329 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -611,7 +611,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data) { struct platform_device *plat_dev = to_platform_device(dev); struct pci_dev *pci_dev = data; - unsigned int id = (pci_dev->bus->number << 8) | pci_dev->devfn; + unsigned int id = pci_dev->irq; return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id; } diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index feba967..7c069a0 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -447,7 +447,7 @@ static void usa26_indat_callback(struct urb *urb) port = (struct usb_serial_port *) urb->context; tty = port->tty; - if (urb->actual_length) { + if (tty && urb->actual_length) { /* 0x80 bit is error flag */ if ((data[0] & 0x80) == 0) { /* no errors on individual bytes, only possible overrun err*/ diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index ad35033..b3c31d9 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c @@ -488,7 +488,7 @@ static int s3c2410fb_set_par(struct fb_info *info) break; } - info->fix.line_length = (var->width * var->bits_per_pixel) / 8; + info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8; /* activate this new configuration */ |
