Comment 97 for bug 1551041

Revision history for this message
sudodus (nio-wiklund) wrote :

I tried in the system which is suffering from this bug (Lubuntu Xenial with the kernel

Linux xenial32 4.4.0-11-generic #26-Ubuntu SMP Sat Mar 5 14:22:05 UTC 2016 i686

and I failed with the git command. I replied directly to tiwai, and post a copy here.

*Maybe you can see what is wrong*

- Should I set up another system, which is more likely to manage with this git command?

- Do I need some other tools?

- Are there any unwanted newlines introduced by the email transfer of the patch?

- Other things (beyond my imagination)?

---
Hi again Takashi,

I tried this fix according to the instructions at

https://wiki.ubuntu.com/Kernel/KernelBisection#Testing_a_newly_released_patch_from_upstream

but I failed. I don't know what I'm doing, so it might be my fault. But I have one question. What about the #endif string? Is it matched?

See the output from my command line:

Klonar till "linux"...
remote: Counting objects: 4583735, done.
remote: Compressing objects: 100% (3254/3254), done.
remote: Total 4583735 (delta 1999), reused 0 (delta 0)
Tar emot objekt: 100% (4583735/4583735), 804.14 MiB | 1.05 MiB/s, klart.
Analyserar delta: 100% (3846439/3846439), klart.
Kontrollerar om vi fick alla objekt... klart.
Checkar ut filer: 100% (52916/52916), klart.
patching file /home/olle/linux/drivers/acpi/video.c
Hunk #1 FAILED at 432.
1 out of 1 hunk FAILED -- saving rejects to file /home/olle/linux/drivers/acpi/video.c.rej
patch: **** Can't reopen file /home/olle/linux/drivers/acpi/video.c : No such file or directory
-----
And the rejected stuff:
--- au88x0_pcm.c
+++ au88x0_pcm.c
@@ -432,7 +432,10 @@ static snd_pcm_uframes_t snd_vortex_pcm_pointer(struct snd_pcm_substream *substr
#endif
//printk(KERN_INFO "vortex: pointer = 0x%x\n", current_ptr);
spin_unlock(&chip->lock);
- return (bytes_to_frames(substream->runtime, current_ptr));
+ current_ptr = bytes_to_frames(substream->runtime, current_ptr);
+ if (current_ptr >= substream->runtime->buffer_size)
+ current_ptr = 0;
+ return current_ptr;
}

/* operators */