Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-int10-fix-error-check-for-pci_device_map_legacy.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-int10-fix-error-check-for-pci_device_map_legacy.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
    2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server' type='application/atom+xml'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>0001-int10-Fix-error-check-for-pci_device_map_legacy.patch</a></div><div class='content'>blob: 75e5bb92f8eff05dbdfcc0861d6a000574ceec46 (<a href='/svntogit/packages.git/plain/trunk/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch?h=packages/xorg-server'>plain</a>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     <a id='n31' href='#n31'>31</a>  
     <a id='n32' href='#n32'>32</a>  
     <a id='n33' href='#n33'>33</a>  
     <a id='n34' href='#n34'>34</a>  
     <a id='n35' href='#n35'>35</a>  
     <a id='n36' href='#n36'>36</a>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     </pre></td>  
     <td class='lines'><pre><code>From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001  
     From: =?UTF-8?q?J=C3=BCrg=20Billeter?= &lt;j&#64;bitron.ch&gt;  
    3  Date: Sat, 7 Feb 2015 18:13:21 +0100  Date: Sat, 7 Feb 2015 18:13:21 +0100
    4  Subject: [PATCH] int10: Fix error check for pci_device_map_legacy  Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
    5  MIME-Version: 1.0  MIME-Version: 1.0
    # Line 108  Content-Transfer-Encoding: 8bit Line 8  Content-Transfer-Encoding: 8bit
    8    
    9  pci_device_map_legacy returns 0 on success.  pci_device_map_legacy returns 0 on success.
    10    
    11  Signed-off-by: Jürg Billeter &lt;j&#64;bitron.ch&gt;  Signed-off-by: Jürg Billeter <j@bitron.ch>
    12  Reviewed-by: Adam Jackson &lt;ajax&#64;redhat.com&gt;  Reviewed-by: Adam Jackson <ajax@redhat.com>
    13  Signed-off-by: Peter Hutterer &lt;peter.hutterer&#64;who-t.net&gt;  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    14  <span class="hl kwb">---</span>  ---
    15   hw/xfree86/int10/generic.c                | 2 +-   hw/xfree86/int10/generic.c                | 2 +-
    16   hw/xfree86/os-support/linux/int10/linux.c | 2 +-   hw/xfree86/os-support/linux/int10/linux.c | 2 +-
    17   2 files changed, 2 insertions(+), 2 deletions(-)   2 files changed, 2 insertions(+), 2 deletions(-)
    18    
    19  diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c  diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
    20  index 012d194..8d5c4da 100644  index 012d194..8d5c4da 100644
    21  <span class="hl kwb">--- a/hw/xfree86/int10/generic.c</span>  --- a/hw/xfree86/int10/generic.c
    22  <span class="hl kwa">+++ b/hw/xfree86/int10/generic.c</span>  +++ b/hw/xfree86/int10/generic.c
    23  &#64;&#64; -104,7 +104,7 &#64;&#64; readIntVec(struct pci_device *dev, unsigned char *buf, int len)  @@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
    24   {   {
    25       void *map;       void *map;
    26    
    27  <span class="hl kwb">-    if (!pci_device_map_legacy(dev, 0, len, 0, &amp;map))</span>  -    if (!pci_device_map_legacy(dev, 0, len, 0, &map))
    28  <span class="hl kwa">+    if (pci_device_map_legacy(dev, 0, len, 0, &amp;map))</span>  +    if (pci_device_map_legacy(dev, 0, len, 0, &map))
    29           return FALSE;           return FALSE;
    30    
    31       memcpy(buf, map, len);       memcpy(buf, map, len);
    32  diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c  diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
    33  index 79b9a88..6ca118f 100644  index 79b9a88..6ca118f 100644
    34  <span class="hl kwb">--- a/hw/xfree86/os-support/linux/int10/linux.c</span>  --- a/hw/xfree86/os-support/linux/int10/linux.c
    35  <span class="hl kwa">+++ b/hw/xfree86/os-support/linux/int10/linux.c</span>  +++ b/hw/xfree86/os-support/linux/int10/linux.c
    36  &#64;&#64; -75,7 +75,7 &#64;&#64; readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)  @@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
    37   {   {
    38       void *map;       void *map;
    39    
    40  <span class="hl kwb">-    if (!pci_device_map_legacy(dev, base, len, 0, &amp;map))</span>  -    if (!pci_device_map_legacy(dev, base, len, 0, &map))
    41  <span class="hl kwa">+    if (pci_device_map_legacy(dev, base, len, 0, &amp;map))</span>  +    if (pci_device_map_legacy(dev, base, len, 0, &map))
    42           return FALSE;           return FALSE;
    43    
    44       memcpy(buf, map, len);       memcpy(buf, map, len);
    45  <span class="hl kwb">-- </span>  --
    46  2.3.2  2.3.2
    47    
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576