D30360.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30360.diff
View Options

	diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
	--- a/sys/dev/firewire/sbp.c
	+++ b/sys/dev/firewire/sbp.c
	@@ -2273,7 +2273,7 @@
	sbp_action(struct cam_sim sim, union ccb ccb)
	{

	- struct sbp_softc sbp = (struct sbp_softc )sim->softc;
	+ struct sbp_softc *sbp = cam_sim_softc(sim);
	struct sbp_target *target = NULL;
	struct sbp_dev *sdev = NULL;

	@@ -2632,7 +2632,7 @@
	struct sbp_softc *sbp;
	struct firewire_comm *fc;

	- sbp = (struct sbp_softc *)sim->softc;
	+ sbp = cam_sim_softc(sim);
	fc = sbp->fd.fc;

	fc->poll(fc, 0, -1);
	diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
	--- a/sys/dev/usb/storage/umass.c
	+++ b/sys/dev/usb/storage/umass.c
	@@ -2157,7 +2157,7 @@
	static void
	umass_cam_action(struct cam_sim sim, union ccb ccb)
	{
	- struct umass_softc sc = (struct umass_softc )sim->softc;
	+ struct umass_softc *sc = cam_sim_softc(sim);

	if (sc == NULL) {
	ccb->ccb_h.status = CAM_SEL_TIMEOUT;
	@@ -2433,7 +2433,7 @@
	static void
	umass_cam_poll(struct cam_sim *sim)
	{
	- struct umass_softc sc = (struct umass_softc )sim->softc;
	+ struct umass_softc *sc = cam_sim_softc(sim);

	if (sc == NULL)
	return;