LinuxQuestions.org
Review your favorite Linux distribution.
Home Forums Tutorials Articles Register
Go Back   LinuxQuestions.org > Forums > Linux Forums > Linux - General
User Name
Password
Linux - General This Linux forum is for general Linux questions and discussion.
If it is Linux Related and doesn't seem to fit in any other forum then this is the place.

Notices


Reply
  Search this Thread
Old 11-28-2002, 04:46 PM   #1
McQuaid
LQ Newbie
 
Registered: Nov 2002
Posts: 1

Rep: Reputation: 0
trying to patch i810_audio diff file


I'm trying to patch this diff file listed here by Alan cox:
deja post

I modified the 2nd line to point to where my source is.
I tried patch </path/i810_audio.c while in the dir of my source.

But I get 1 out of 48 hunk errors:

Hunk #27 FAILED at 2689
patch unexpectedly ends in middle of line

I thought it might be formatting issue so i tried patch with the -l switch but didn't help.

Here is the section 2689 from the diff file:

@@ -2689,7 +2899,7 @@

/* Don't attempt to get eid until powerup is complete */
eid = i810_ac97_get(codec, AC97_EXTENDED_ID);
-
+
if(eid==0xFFFFFF)
{
printk(KERN_WARNING "i810_audio: no codec attached ?\n");


I've just installed mdk 9 a week ago and this is probably more advanced stuff that I shouldn't be mucking with yet, but from reading other people's posts, I'm pretty sure this will solve my sound problems.

I didn't like getting this diff file from a newsgroup post, but couldn't find it anywhere else. Does Alan Cox post diff files anywhere else? I couldn't find it at www.kernel.org.

I just want to get sound working so if someone could help me fix this file it would be great. Or would there be a way to dump the mandrake kernel in favour of the alan cox kernel? As this patch has been part of the AC kernel for some time. If I could do this would alot of Mdk stuff break?

Also once I patch this file I"m not sure if I have all the steps after that in order, So if anyone can help there as well it would be great.
 
Old 11-28-2002, 05:26 PM   #2
vladkrack
Member
 
Registered: Oct 2002
Location: Curitiba - Brazil
Distribution: Conectiva
Posts: 334

Rep: Reputation: 30
Hi,

I Hunk ocour when patch don't find the exact line that the diff is pointing to, when there are too many hunks or a Hunk that is out of the search limits,the patch fail.

Aparently that section of the diff file does nothing but adjust some space or tab forgotten there, is usual, if in that section there is nothing else, just remove it and try again ...

Another option is to use some applications that remodel your diff file, I think I saw something like that in freshmeat, patchutils was the name ...

Hope that helps ...
 
  


Reply



Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off



Similar Threads
Thread Thread Starter Forum Replies Last Post
patch -p1 x.diff but no patch command!? pyenos Linux - Hardware 1 03-04-2005 03:10 PM
how can i patch a file from source and diff? gunslinger77 Linux - General 1 04-21-2004 08:23 PM
What's the difference between .diff and .patch? nidua18 Linux - Software 0 10-15-2003 12:25 AM
I have a patch (diff file). What now? Gurduloo Linux - Newbie 2 05-27-2003 02:20 PM
diff-patch mtb Linux - Software 1 03-23-2003 01:49 PM

LinuxQuestions.org > Forums > Linux Forums > Linux - General

All times are GMT -5. The time now is 07:06 PM.

Main Menu
Advertisement
My LQ
Write for LQ
LinuxQuestions.org is looking for people interested in writing Editorials, Articles, Reviews, and more. If you'd like to contribute content, let us know.
Main Menu
Syndicate
RSS1  Latest Threads
RSS1  LQ News
Twitter: @linuxquestions
Open Source Consulting | Domain Registration