mirror of
https://git.yoctoproject.org/poky
synced 2026-04-25 06:32:12 +02:00
9deb373671
This patch includes the update of patch upstream status of the following recipes (50 in all): grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls hal js libgcrypt libnl libusb-compat (From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
27 lines
753 B
Diff
27 lines
753 B
Diff
Upstream-Status: Pending
|
|
|
|
--- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100
|
|
+++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100
|
|
@@ -58,6 +58,10 @@
|
|
|
|
#include "linux_dvd_rw_utils.h"
|
|
|
|
+#if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
|
|
+# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
|
|
+#endif
|
|
+
|
|
typedef enum {
|
|
NONE = CGC_DATA_NONE, // 3
|
|
READ = CGC_DATA_READ, // 2
|
|
@@ -153,8 +153,8 @@
|
|
errno = EIO;
|
|
ret = -1;
|
|
if (cmd->sg_io.masked_status & CHECK_CONDITION) {
|
|
- CREAM_ON_ERRNO (cmd->sg_io.sbp);
|
|
- ret = ERRCODE (cmd->sg_io.sbp);
|
|
+ CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp);
|
|
+ ret = ERRCODE ((char*)cmd->sg_io.sbp);
|
|
if (ret == 0)
|
|
ret = -1;
|
|
}
|