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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
dt/fsldma: fix build warning caused by of_platform_device changes
spi: Fix race condition in stop_queue()
gpio/pch_gpio: Fix output value of pch_gpio_direction_output()
gpio/ml_ioh_gpio: Fix output value of ioh_gpio_direction_output()
gpio/pca953x: fix error handling path in probe() call

+10 -7
+1 -1
drivers/dma/fsldma.c
··· 1448 1448 {} 1449 1449 }; 1450 1450 1451 - static struct of_platform_driver fsldma_of_driver = { 1451 + static struct platform_driver fsldma_of_driver = { 1452 1452 .driver = { 1453 1453 .name = "fsl-elo-dma", 1454 1454 .owner = THIS_MODULE,
+1
drivers/gpio/ml_ioh_gpio.c
··· 116 116 reg_val |= (1 << nr); 117 117 else 118 118 reg_val &= ~(1 << nr); 119 + iowrite32(reg_val, &chip->reg->regs[chip->ch].po); 119 120 120 121 mutex_unlock(&chip->lock); 121 122
+3 -2
drivers/gpio/pca953x.c
··· 558 558 559 559 ret = gpiochip_add(&chip->gpio_chip); 560 560 if (ret) 561 - goto out_failed; 561 + goto out_failed_irq; 562 562 563 563 if (pdata->setup) { 564 564 ret = pdata->setup(client, chip->gpio_chip.base, ··· 570 570 i2c_set_clientdata(client, chip); 571 571 return 0; 572 572 573 - out_failed: 573 + out_failed_irq: 574 574 pca953x_irq_teardown(chip); 575 + out_failed: 575 576 kfree(chip->dyn_pdata); 576 577 kfree(chip); 577 578 return ret;
+1
drivers/gpio/pch_gpio.c
··· 105 105 reg_val |= (1 << nr); 106 106 else 107 107 reg_val &= ~(1 << nr); 108 + iowrite32(reg_val, &chip->reg->po); 108 109 109 110 mutex_unlock(&chip->lock); 110 111
+1 -1
drivers/spi/amba-pl022.c
··· 1555 1555 * A wait_queue on the pl022->busy could be used, but then the common 1556 1556 * execution path (pump_messages) would be required to call wake_up or 1557 1557 * friends on every SPI message. Do this instead */ 1558 - while (!list_empty(&pl022->queue) && pl022->busy && limit--) { 1558 + while ((!list_empty(&pl022->queue) || pl022->busy) && limit--) { 1559 1559 spin_unlock_irqrestore(&pl022->queue_lock, flags); 1560 1560 msleep(10); 1561 1561 spin_lock_irqsave(&pl022->queue_lock, flags);
+1 -1
drivers/spi/dw_spi.c
··· 821 821 822 822 spin_lock_irqsave(&dws->lock, flags); 823 823 dws->run = QUEUE_STOPPED; 824 - while (!list_empty(&dws->queue) && dws->busy && limit--) { 824 + while ((!list_empty(&dws->queue) || dws->busy) && limit--) { 825 825 spin_unlock_irqrestore(&dws->lock, flags); 826 826 msleep(10); 827 827 spin_lock_irqsave(&dws->lock, flags);
+1 -1
drivers/spi/pxa2xx_spi.c
··· 1493 1493 * execution path (pump_messages) would be required to call wake_up or 1494 1494 * friends on every SPI message. Do this instead */ 1495 1495 drv_data->run = QUEUE_STOPPED; 1496 - while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) { 1496 + while ((!list_empty(&drv_data->queue) || drv_data->busy) && limit--) { 1497 1497 spin_unlock_irqrestore(&drv_data->lock, flags); 1498 1498 msleep(10); 1499 1499 spin_lock_irqsave(&drv_data->lock, flags);
+1 -1
drivers/spi/spi_bfin5xx.c
··· 1284 1284 * friends on every SPI message. Do this instead 1285 1285 */ 1286 1286 drv_data->running = false; 1287 - while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) { 1287 + while ((!list_empty(&drv_data->queue) || drv_data->busy) && limit--) { 1288 1288 spin_unlock_irqrestore(&drv_data->lock, flags); 1289 1289 msleep(10); 1290 1290 spin_lock_irqsave(&drv_data->lock, flags);