|
@@ -258,6 +258,11 @@ static void bitbang_work(struct work_struct *work)
|
|
struct spi_bitbang *bitbang =
|
|
struct spi_bitbang *bitbang =
|
|
container_of(work, struct spi_bitbang, work);
|
|
container_of(work, struct spi_bitbang, work);
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
+ int do_setup = -1;
|
|
|
|
+ int (*setup_transfer)(struct spi_device *,
|
|
|
|
+ struct spi_transfer *);
|
|
|
|
+
|
|
|
|
+ setup_transfer = bitbang->setup_transfer;
|
|
|
|
|
|
spin_lock_irqsave(&bitbang->lock, flags);
|
|
spin_lock_irqsave(&bitbang->lock, flags);
|
|
bitbang->busy = 1;
|
|
bitbang->busy = 1;
|
|
@@ -269,8 +274,6 @@ static void bitbang_work(struct work_struct *work)
|
|
unsigned tmp;
|
|
unsigned tmp;
|
|
unsigned cs_change;
|
|
unsigned cs_change;
|
|
int status;
|
|
int status;
|
|
- int (*setup_transfer)(struct spi_device *,
|
|
|
|
- struct spi_transfer *);
|
|
|
|
|
|
|
|
m = container_of(bitbang->queue.next, struct spi_message,
|
|
m = container_of(bitbang->queue.next, struct spi_message,
|
|
queue);
|
|
queue);
|
|
@@ -287,19 +290,19 @@ static void bitbang_work(struct work_struct *work)
|
|
tmp = 0;
|
|
tmp = 0;
|
|
cs_change = 1;
|
|
cs_change = 1;
|
|
status = 0;
|
|
status = 0;
|
|
- setup_transfer = NULL;
|
|
|
|
|
|
|
|
list_for_each_entry (t, &m->transfers, transfer_list) {
|
|
list_for_each_entry (t, &m->transfers, transfer_list) {
|
|
|
|
|
|
- /* override or restore speed and wordsize */
|
|
|
|
- if (t->speed_hz || t->bits_per_word) {
|
|
|
|
- setup_transfer = bitbang->setup_transfer;
|
|
|
|
|
|
+ /* override speed or wordsize? */
|
|
|
|
+ if (t->speed_hz || t->bits_per_word)
|
|
|
|
+ do_setup = 1;
|
|
|
|
+
|
|
|
|
+ /* init (-1) or override (1) transfer params */
|
|
|
|
+ if (do_setup != 0) {
|
|
if (!setup_transfer) {
|
|
if (!setup_transfer) {
|
|
status = -ENOPROTOOPT;
|
|
status = -ENOPROTOOPT;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- }
|
|
|
|
- if (setup_transfer) {
|
|
|
|
status = setup_transfer(spi, t);
|
|
status = setup_transfer(spi, t);
|
|
if (status < 0)
|
|
if (status < 0)
|
|
break;
|
|
break;
|
|
@@ -363,9 +366,10 @@ static void bitbang_work(struct work_struct *work)
|
|
m->status = status;
|
|
m->status = status;
|
|
m->complete(m->context);
|
|
m->complete(m->context);
|
|
|
|
|
|
- /* restore speed and wordsize */
|
|
|
|
- if (setup_transfer)
|
|
|
|
|
|
+ /* restore speed and wordsize if it was overridden */
|
|
|
|
+ if (do_setup == 1)
|
|
setup_transfer(spi, NULL);
|
|
setup_transfer(spi, NULL);
|
|
|
|
+ do_setup = 0;
|
|
|
|
|
|
/* normally deactivate chipselect ... unless no error and
|
|
/* normally deactivate chipselect ... unless no error and
|
|
* cs_change has hinted that the next message will probably
|
|
* cs_change has hinted that the next message will probably
|